forgot to save file before commiting a merge

DonJayamanne · Oct 11, 2017 · 733dff2 · 733dff2
1 parent 154d33a
commit 733dff2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -23,11 +23,7 @@
     "theme": "dark"
   },
   "engines": {
-<<<<<<< HEAD
-    "vscode": "^1.15.0"
-=======
     "vscode": "^1.17.0"
->>>>>>> master
   },
   "recommendations": [
     "donjayamanne.jupyter"