Merge pull request #4 from Jhaemis-hack/feature/remove-packages

"fix: removed package-lock and compose"
hngprojects · Mar 1, 2025 · 2f5a051 · 2f5a051
2 parents dccab25 + d7cea56
commit 2f5a051
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 34,015 deletions.
diff --git a/.gitignore b/.gitignore
@@ -402,12 +402,12 @@ dist
 
 # User specific ignores 
 todo.txt
+/.vscode/
 .vscode/
 
 # Docker compose
 docker-compose.yml
 data/
-<<<<<<< HEAD
 data/
 docker-compose.yml
 package-lock.json
@@ -419,16 +419,12 @@ docker-compose.yml
 data/
 .dev.env
 
-
-=======
-
-# Docker compose
-docker-compose.yml
-data/
->>>>>>> d080450 (chore: created a docker-compose.yml file and updated the gitignore)
+/compose/compose.yaml
+compose/compose.yaml
 
 data/
 docker-compose.yml
+package-lock.json/
 package-lock.json
 .dev.env
 

diff --git a/compose/compose.yaml b/compose/compose.yaml