fixing merge error

launchdarkly · May 4, 2019 · 8a00b23 · 8a00b23
1 parent 4732080
commit 8a00b23
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/packages/launchdarkly-js-client-sdk/package.json b/packages/launchdarkly-js-client-sdk/package.json
@@ -66,11 +66,7 @@
   },
   "dependencies": {
     "escape-string-regexp": "1.0.5",
-<<<<<<< HEAD:packages/ldclient-js/package.json
-    "ldclient-js-common": "^2.10.2"
-=======
-    "launchdarkly-js-sdk-common": "^2.10.1"
->>>>>>> d0d87ecb015fd27c50d9ad82c1947f4891537780:packages/launchdarkly-js-client-sdk/package.json
+    "launchdarkly-js-sdk-common": "^2.10.2"
   },
   "repository": {
     "type": "git",