Skip to content

Commit 23ba9ac

Browse files
committed
v1.14-0
2 parents 0c7635c + 44be6f3 commit 23ba9ac

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/ant.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ jobs:
2626
- if: matrix.os == 'macos-latest'
2727
run: |
2828
ln -s /Library/Frameworks/R.framework/Versions/3.6 /Library/Frameworks/R.framework/Versions/3.5
29+
<<<<<<< HEAD
2930
echo "/Library/Frameworks/R.framework/Resources/bin" >> $GITHUB_PATH
31+
=======
32+
echo "/Library/Frameworks/R.framework/Resources/bin/R" >> $GITHUB_PATH
33+
>>>>>>> 44be6f32740236889b8fdb8a4185e7a8d6c4ceb2
3034
- uses: r-lib/actions/setup-pandoc@v1
3135
- run: |
3236
WD=$PWD

0 commit comments

Comments
 (0)