Update version

hoffmabc · hoffmabc · commit cf90dadfcbf9 · 2016-10-14T12:54:46.000-04:00
diff --git a/package.json b/package.json
@@ -1,7 +1,11 @@
 {
   "name": "openbazaar",
   "productName": "OpenBazaar",
+<<<<<<< Updated upstream
   "version": "1.1.8",
+=======
+  "version": "1.1.7",
+>>>>>>> Stashed changes
   "description": "Decentralized Peer to Peer Marketplace for Bitcoin",
   "main": "Gruntfile.js",
   "scripts": {
