Initial Commit

teamterning · Jun 25, 2024 · 1a6c834 · 1a6c834
1 parent 1eccf44
commit 1a6c834
Showing 1 changed file with 1 addition and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,20 +1,3 @@
-<<<<<<< HEAD
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx
-local.properties
-=======
 # Created by https://www.toptal.com/developers/gitignore/api/androidstudio,macos,windows,android,kotlin
 # Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,macos,windows,android,kotlin
 
@@ -260,5 +243,4 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/androidstudio,macos,windows,android,kotlin
->>>>>>> 8756640160794a3dd571779d71c31e7186f25375
+# End of https://www.toptal.com/developers/gitignore/api/androidstudio,macos,windows,android,kotlin