Remove git comments

OpenBazaar · Oct 14, 2016 · c7c3992 · c7c3992
1 parent cf90dad
commit c7c3992
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,11 +1,7 @@
 {
   "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": {