removed ds_store

shashaaankkkkk · shashaaankkkkk · commit da776554955a · 2024-01-07T19:47:09.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -157,8 +157,3 @@ cython_debug/
 
 #.DS_Store
 .DS_Store
-<<<<<<< HEAD
-
-=======
-.DS_Store
->>>>>>> 205aaec (removed ds_store)
