remove conflict message

jbrumwell · May 30, 2022 · eda5332 · eda5332
1 parent df71d1e
commit eda5332
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -46,5 +46,4 @@
         "lodash": "^4.14.2",
         "semver": "^5.3.0"
     }
->>>>>>> 6a67629635972bebe4583c8046f4ef43d141be44
 }