Fix some merge conflicts

morganlittle · morganlittle · commit b395a76e2690 · 2023-02-13T07:22:23.000-05:00
Fix issue in workflow file related to unmerged conflicts

Morgan Little &lt;mlittle@lakeheadu.ca&gt;
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1250,11 +1250,7 @@ jobs:
         run: |
           if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" != "true" ]]; then
             # PR build
-<<<<<<< Updated upstream
-            echo "::ccccccccccccccccccccccccccccccccccccccccccccccccccccccc name=tag::dev"
-=======
             echo "tag=dev" >> $GITHUB_OUTPUT
->>>>>>> Stashed changes
           else
             VERSION="v$(cat VERSION)"
             if [[ "${{ github.ref }}" != "refs/tags/${VERSION}" ]]; then
@@ -2382,11 +2378,7 @@ jobs:
         id: npm-cache-dir
         run: |
           echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-<<<<<<< Updated upstream
-      - uses: actions/cache@v2
-=======
       - uses: actions/cache@v3
->>>>>>> Stashed changes
         id: node-modules-cache
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -2450,11 +2442,7 @@ jobs:
         id: npm-cache-dir
         run: |
           echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-<<<<<<< Updated upstream
-      - uses: actions/cache@v2
-=======
       - uses: actions/cache@v3
->>>>>>> Stashed changes
         id: electron-modules-cache
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -2766,11 +2754,7 @@ jobs:
         id: npm-cache-dir
         run: |
           echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-<<<<<<< Updated upstream
-      - uses: actions/cache@v2
-=======
       - uses: actions/cache@v3
->>>>>>> Stashed changes
         id: node-modules-cache
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
@@ -2835,11 +2819,7 @@ jobs:
         id: npm-cache-dir
         run: |
           echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
-<<<<<<< Updated upstream
-      - uses: actions/cache@v2
-=======
       - uses: actions/cache@v3
->>>>>>> Stashed changes
         id: electron-modules-cache
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
