remove merge conflict

Opentrons · Dec 4, 2023 · 161e102 · 161e102
1 parent 99408c9
commit 161e102
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/components-test-build-deploy.yaml b/.github/workflows/components-test-build-deploy.yaml
@@ -202,14 +202,10 @@ jobs:
           json -I -f ./components/package.json -e "this.version=\"$VERSION_STRING\""
           json -I -f ./components/package.json -e "this.dependencies['@opentrons/shared-data']=\"$VERSION_STRING\""
       - name: 'publish to npm registry'
-<<<<<<< Updated upstream
-        run: cp ./.npmrc ./components/.npmrc && cd ./components && npm publish --access public
         env: 
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-=======
         run: |
           cd ./components && echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ./.npmrc && npm publish --access public
->>>>>>> Stashed changes