updated deps

Author: kHRISl33t

package-lock.json

@@ -41,19 +41,12 @@
     "package-lock.json"
   ],
   "devDependencies": {
-<<<<<<< HEAD
     "eslint": "^7.16.0",
     "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-prettier": "^3.3.0",
     "jest": "^26.6.3",
     "jest-junit": "^12.0.0",
     "prettier": "^2.2.1"
-=======
-    "eslint": "^7.10.0",
-    "eslint-config-prettier": "^6.12.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "prettier": "^2.1.2"
->>>>>>> added eslint and prettier
   }
 }