updated git ignore

bcgov · Aug 1, 2024 · 5afc541 · 5afc541
1 parent b8ada77
commit 5afc541
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,6 @@ public/config/configuration.json
 *.log
 <<<<<<< HEAD
 !vaults.env
-=======
->>>>>>> EPortman-20291-move-app-to-app-directory
 
 # Cypress related files
 **/cypress.env.json