Update ant.yml

Author: yannrichet

.github/workflows/ant.yml

@@ -26,12 +26,8 @@ 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    - uses: r-lib/actions/setup-pandoc@v1
-=======
         echo "/Library/Frameworks/R.framework/Resources/bin" >> $GITHUB_PATH
     - uses: r-lib/actions/setup-pandoc@v1
->>>>>>> 6925a10cbbdf016f1ac8b09b2acb8d19f301ef86
     - run: |
         WD=$PWD
         cd ..