fix merge

ffenix113 · Jan 24, 2024 · 64bbf70 · 64bbf70
1 parent 0da21cf
commit 64bbf70
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,9 +1,6 @@
 name: Docs
 on:
-<<<<<<< HEAD
   workflow_dispatch:
-=======
->>>>>>> 4b6e3d3 (update workflow to add push condition)
   push:
     branches:
       - main