Fix merge conflicts

Quantco · Mar 11, 2024 · 08e6503 · 08e6503
1 parent c5b0431
commit 08e6503
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/keep-alive.yml b/.github/workflows/keep-alive.yml
@@ -11,13 +11,4 @@ jobs:
       actions: write
     steps:
       - uses: actions/checkout@v4
-<<<<<<< before updating
-      - uses: gautamkrishnar/keepalive-workflow@306efe4fc63923e36571682b4f4b3e3eee8b6625
-        with:
-          commit_message: Ah ah ah, stayin' alive
-          committer_username: ForrestQuant
-          committer_email: [email protected]
-          time_elapsed: 50 # days
-=======
       - uses: gautamkrishnar/keepalive-workflow@14b7c72e9af14bddbbc1022a6f0bd20b1eac2619
->>>>>>> after updating