Merge pull request #2 from oslabs-beta/terrystest

json merge conflict solved # 2

Author: codeByCandlelight

package.json

@@ -28,22 +28,12 @@
     "dot-prop": "^6.0.0",
     "fs-extra": "^8.1.0",
     "localforage": "^1.7.3",
-<<<<<<< HEAD
     "lodash": "^4.17.21",
     "lodash.isequal": "^4.5.0",
     "lodash.throttle": "^4.1.1",
     "mousetrap": "^1.6.3",
     "npm": "^6.14.14",
     "prismjs": "^1.24.1",
-=======
-    "lodash": ">=4.17.19",
-    "lodash.isequal": "^4.5.0",
-    "lodash.throttle": "^4.1.1",
-    "mousetrap": "^1.6.3",
-    "node-forge": "^0.10.0",
-    "npm": "^6.14.5",
-    "prismjs": "^1.16.0",
->>>>>>> 835023cad4c4adea81c05464317c052a0a8931d2
     "quasar": "^1.0.0",
     "vue-custom-context-menu": "^3.0.1",
     "vue-drag-resize": "^1.3.2",
@@ -63,13 +53,8 @@
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.1",
     "devtron": "^1.4.0",
-<<<<<<< HEAD
     "electron": "^5.0.6",
     "electron-builder": "^22.11.10",
-=======
-    "electron": "^7.2.4",
-    "electron-builder": "^22.7.0",
->>>>>>> 835023cad4c4adea81c05464317c052a0a8931d2
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
     "eslint": "^5.10.0",