Update ant.yml

Funz · Nov 27, 2021 · 9de4291 · 9de4291
1 parent c697c15
commit 9de4291
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -26,11 +26,7 @@ jobs:
     - if: matrix.os == 'macos-latest'
       run: |
         ln -s /Library/Frameworks/R.framework/Versions/3.6 /Library/Frameworks/R.framework/Versions/3.5
-<<<<<<< HEAD
         echo "/Library/Frameworks/R.framework/Resources/bin" >> $GITHUB_PATH
-=======
-        echo "/Library/Frameworks/R.framework/Resources/bin/R" >> $GITHUB_PATH
->>>>>>> daefe2fce90e44602e1527c039eb38226e305aca
     - uses: r-lib/actions/setup-pandoc@v1
     - run: |
         WD=$PWD