Fix workflow merge conflicts

Author: andrjohns

.github/workflows/main.yml

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-name: Windows RTools 4.0
-=======
 name: Windows Rtools40
->>>>>>> develop
 
 on:
   pull_request:
@@ -31,16 +27,6 @@ jobs:
     - uses: actions/setup-python@v2
       with:
         python-version: '2.x'
-<<<<<<< HEAD
-    - uses: r-lib/actions/setup-r@v1
-      with:
-        r-version: 'release'
-    - name: Set path for RTools 4.0
-      if: runner.os == 'Windows'
-      run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-    - name: Print g++ & make version and path
-      shell: powershell
-=======
     - uses: r-lib/actions/setup-r@v2
       with:
         r-version: 4.1.3
@@ -50,7 +36,6 @@ jobs:
       run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
     - name: Install mingw32-make and check toolchain path
       if: runner.os == 'Windows'
->>>>>>> develop
       run: |
         pacman -Syu mingw-w64-x86_64-make --noconfirm
         g++ --version
@@ -89,16 +74,6 @@ jobs:
     - uses: actions/setup-python@v2
       with:
         python-version: '2.x'
-<<<<<<< HEAD
-    - uses: r-lib/actions/setup-r@v1
-      with:
-        r-version: 'release'
-    - name: Set path for RTools 4.0
-      if: runner.os == 'Windows'
-      run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-    - name: Print g++ & make version and path
-      shell: powershell
-=======
     - uses: r-lib/actions/setup-r@v2
       with:
         r-version: 4.1.3
@@ -108,7 +83,6 @@ jobs:
       run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
     - name: Install mingw32-make and check toolchain path
       if: runner.os == 'Windows'
->>>>>>> develop
       run: |
         pacman -Syu mingw-w64-x86_64-make --noconfirm
         g++ --version