fix: remove conflict markings

mariajgrimaldi · mariajgrimaldi · commit 7920359f8b7e · 2025-09-30T16:59:47.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -64,10 +64,6 @@ docs/openedx_authz.*.rst
 requirements/private.in
 requirements/private.txt
 
-<<<<<<< HEAD
-# Sqlite Database
-=======
 # Persistent database files
 *.sqlite3
->>>>>>> 5151d69 (refactor: update gitignore with .sqlite files)
 *.db
