resolved conflicts

sushilshinde · sushilshinde · commit 924340316ff3 · 2020-02-25T13:57:01.000+05:30
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,13 +28,8 @@ jobs:
       - attach_workspace:
           at: .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-<<<<<<< HEAD
       - run: npm publish --tag test-release
-
-=======
-      - run: npm publish
 # dont change anything
->>>>>>> origin/develop-mm-sub-merge-fix
 workflows:
   version: 2
   build:
