Fixed issue in yaml file

dave-mcconnell · Mar 3, 2020 · f189ab7 · f189ab7
1 parent bf9013f
commit f189ab7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,10 +5,6 @@ jobs:
     runs-on: ubuntu-latest
     name: Test job
     steps:
-<<<<<<< HEAD
-      # To use this repository's private action, you must check out the repository
-=======
->>>>>>> origin/feature/bootstrap
       - name: Checkout
         uses: actions/checkout@v2
       - name: Test this action