From 7d3188da60cd60ac66acd2e60af4fe4e0ed99a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9cate?= <Kleidukos@users.noreply.github.com>
Date: Tue, 8 Oct 2024 16:18:41 +0200
Subject: [PATCH] Update whitespace.yml

---
 .github/workflows/whitespace.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/whitespace.yml b/.github/workflows/whitespace.yml
index 895ace54b4d..93c1a41b07f 100644
--- a/.github/workflows/whitespace.yml
+++ b/.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)