fix: resolve conflicts issues

hngprojects · Mar 2, 2025 · 5e6abd0 · 5e6abd0
1 parent 1cfd595
commit 5e6abd0
Show file tree

Hide file tree

Showing 2 changed files with 21,137 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -104,7 +104,7 @@ BenchmarkDotNet.Artifacts/
 
 # .NET Core
 project.lock.json
-package-lock.json
+
 project.fragment.lock.json
 artifacts/
 **/Properties/launchSettings.json
@@ -412,7 +412,7 @@ data/db
 # 
 
 
-package-lock.json
+
 
 
 # User specific ignores 
@@ -425,11 +425,11 @@ todo.txt
 data/
 data/
 docker-compose.yml
-package-lock.json
+
 .dev.env
 
 
-package-lock.json
+
 docker-compose.yml
 data/
 .dev.env
@@ -439,12 +439,12 @@ compose/compose.yaml
 
 data/
 docker-compose.yml
-package-lock.json/
-package-lock.json
+
+
 .dev.env
 
 
-package-lock.json
+
 
 data/
 .dev.env