Browse Source

Fix: Unresolved conflict commit in .gitignore

I made the merge for .gitignore file which wasn't merged but was uploaded anyway
Isaac Yriarte 10 months ago
parent
commit
8d658f8776
1 changed files with 6 additions and 9 deletions
  1. 6 9
      .gitignore

+ 6 - 9
.gitignore

@@ -1,24 +1,23 @@
1 1
 # Built application files
2
-<<<<<<< HEAD
3 2
 /*/build/
4 3
 build
5
- 
4
+
6 5
 # Crashlytics configuations
7 6
 com_crashlytics_export_strings.xml
8
- 
7
+
9 8
 # Local configuration file (sdk path, etc)
10 9
 local.properties
11
- 
10
+
12 11
 # Gradle generated files
13 12
 .gradle/
14
- 
13
+
15 14
 # Signing files
16 15
 .signing/
17
- 
16
+
18 17
 # User-specific configurations
19 18
 .idea
20 19
 *.iml
21
- 
20
+
22 21
 # OS-specific files
23 22
 .DS_Store
24 23
 .DS_Store?
@@ -27,7 +26,6 @@ local.properties
27 26
 .Trashes
28 27
 ehthumbs.db
29 28
 Thumbs.db
30
-=======
31 29
 *.apk
32 30
 *.ap_
33 31
 
@@ -67,4 +65,3 @@ captures/
67 65
 
68 66
 # Keystore files
69 67
 *.jks
70
->>>>>>> 2825a231044d7a3f3b41dacfd435a8a047966001