Fix package.json conflicts

examples/console/package.json

@@ -9,11 +9,7 @@
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyterlab": "file:../..",
     "phosphor-commandpalette": "^0.2.0",
     "phosphor-keymap": "^0.8.0",

examples/filebrowser/package.json

@@ -9,11 +9,7 @@
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyterlab": "file:../..",
     "phosphor-dockpanel": "^0.9.7",
     "phosphor-keymap": "^0.8.0",

examples/notebook/package.json

@@ -9,11 +9,7 @@
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyterlab": "file:../..",
     "phosphor-commandpalette": "^0.2.0",
     "phosphor-dragdrop": "^0.9.1",

examples/terminal/package.json

@@ -9,11 +9,7 @@
     "watch": "watch 'npm run update && npm run build' ../../src src --wait 10"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyterlab": "file:../..",
     "phosphor-dockpanel": "^0.9.7"
   },

jupyterlab/package.json

@@ -8,11 +8,7 @@
   "dependencies": {
     "es6-promise": "^3.1.2",
     "font-awesome": "^4.6.1",
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyterlab": "file:../",
     "phosphide": "^0.9.5"
   },

package.json

@@ -13,11 +13,7 @@
     "file-loader": "^0.8.5",
     "jquery": "^2.2.0",
     "jquery-ui": "^1.10.5",
-<<<<<<< HEAD
-    "jupyter-js-services": "^0.12.3",
-=======
     "jupyter-js-services": "^0.12.4",
->>>>>>> c9f42bd... Use the terminal session from services
     "jupyter-js-utils": "^0.4.0",
     "jupyter-js-widgets": "2.0.0-dev.0",
     "marked": "^0.3.5",