Update whitespace.yml

Author: Kleidukos

.github/workflows/whitespace.yml

@@ -15,9 +15,7 @@ jobs:
     steps:
 
     - uses: actions/checkout@v4
-<<<<<<< HEAD
-    - uses: andreasabel/fix-whitespace-action@v1
-=======
+
 
     - run: |
         # no longer using the action because apparently we're supposed to use the Makefile here
@@ -28,4 +26,3 @@ jobs:
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - run: make whitespace
->>>>>>> 2858dc099 (add Makefile targets for fix-whitespace)