[feature/initial_setup] Fixing merge conflict

qognitive · Jun 6, 2024 · 6b8cf05 · 6b8cf05
2 parents 745c09f + 20aa677
commit 6b8cf05
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -78,8 +78,4 @@ __pycache__
 *_package
 logs
 scratch
-<<<<<<< HEAD
 notes
-=======
-notes
->>>>>>> 51cbc30 (Add gitignore file)