conflicts prevented

Co-authored-by: Kanishk Pachauri <[email protected]>
FOSS-Community · Dec 28, 2023 · b8a8881 · b8a8881
1 parent f996614
commit b8a8881
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -50,7 +50,6 @@ coverage.xml
 .hypothesis/
 .pytest_cache/
 cover/
-data/
 
 # Translations
 *.mo

diff --git a/data/MAQR b/data/MAQR
@@ -0,0 +1 @@
+This is a test data
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,6 @@ coverage.xml @@
     .hypothesis/
     .pytest_cache/
     cover/
-    data/
     # Translations
     *.mo
@@ Expand Down @@