merge

Author: huanghaibin-dev

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 *.iml
 .gradle
 /local.properties
@@ -8,7 +7,6 @@
 /build
 /captures
 .externalNativeBuild
-=======
 # Built application files
 *.apk
 *.ap_
@@ -48,5 +46,4 @@ captures/
 .idea/workspace.xml
 
 # Keystore files
-*.jks
->>>>>>> ab51c082b2d8437e0799c123e2e66895077253f5
+*.jks