Update jsdom and libxmljs deps

megawac · megawac · commit 7197f396912e · 2014-09-10T22:41:22.000-04:00
diff --git a/package.json b/package.json
@@ -23,8 +23,13 @@
   , "url" : "git@github.com:znerol/node-xmlshim.git"
   }
 , "dependencies" :
+<<<<<<< Updated upstream
   { "jsdom" : "0.2.x"
   , "libxmljs" : "git://github.com/znerol/libxmljs.git#xmlwriter-0.8.1"
+=======
+  { "jsdom" : "0.11.x"
+  , "libxmljs" : "0.8.x"
+>>>>>>> Stashed changes
   }
 , "devDependencies" :
   { "browserify" : "1.10.x"

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,13 @@`
`23`	`23`	`, "url" : "git@github.com:znerol/node-xmlshim.git"`
`24`	`24`	`}`
`25`	`25`	`, "dependencies" :`
	`26`	`+<<<<<<< Updated upstream`
`26`	`27`	`{ "jsdom" : "0.2.x"`
`27`	`28`	`, "libxmljs" : "git://github.com/znerol/libxmljs.git#xmlwriter-0.8.1"`
	`29`	`+=======`
	`30`	`+ { "jsdom" : "0.11.x"`
	`31`	`+ , "libxmljs" : "0.8.x"`
	`32`	`+>>>>>>> Stashed changes`
`28`	`33`	`}`
`29`	`34`	`, "devDependencies" :`
`30`	`35`	`{ "browserify" : "1.10.x"`