merge and resolve conflicts

logan-r · logan-r · commit 2829f542740e · 2021-01-27T12:15:10.000-05:00
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
     "name": "hackerAPI",
-<<<<<<< HEAD
-    "version": "3.1.2",
-=======
     "version": "3.1.3",
->>>>>>> dev
     "private": true,
     "scripts": {
         "start": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",
