Fixed unresolved merge

1ForeverHD · Mar 28, 2024 · 694f70c · 694f70c
1 parent 1530bee
commit 694f70c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/DeployDocs.yml b/.github/workflows/DeployDocs.yml
@@ -2,14 +2,9 @@ name: MkDocs Deploy
 
 on:
   push:
-<<<<<<< HEAD
-    branches: #  Act on master branch commit
-    - main
-=======
     branches: #  Act on main branch commit
       - main
 
->>>>>>> development
 jobs:
   deploy:
     runs-on: ubuntu-latest