update ignore

ab44927e · vipcxj · bda8cddc · ab44927e · bda8cddc · bda8cddc
--- a/.gitignore
+++ b/.gitignore
 node_modules/
-<<<<<<< ours
 .expo/
 ios/build/
 android/.gradle
@@ -7,15 +6,14 @@ android/.idea
 android/build/
 android/app/build/
 npm-debug.*
-`
-=======
+*.iml
+
 npm-debug.log
 yarn-error.log

 # BUCK
 buck-out/
 \.buckd/
-*.keystore

 # fastlane
 #
@@ -27,4 +25,3 @@ buck-out/
 */fastlane/report.xml
 */fastlane/Preview.html
 */fastlane/screenshots
->>>>>>> theirs
--- a/android/.gradle/3.3/taskArtifacts/fileHashes.bin
+++ b/android/.gradle/3.3/taskArtifacts/fileHashes.bin
--- a/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin
+++ b/android/.gradle/3.3/taskArtifacts/fileSnapshots.bin
--- a/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin
+++ b/android/.gradle/3.3/taskArtifacts/taskArtifacts.bin
--- a/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock
+++ b/android/.gradle/3.3/taskArtifacts/taskArtifacts.lock
--- a/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
+++ b/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin
--- a/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
+++ b/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock
--- a/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
+++ b/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin
--- a/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
+++ b/android/.gradle/3.3/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock
--- a/android/.idea/.name
+++ b/android/.idea/.name
-AwesomeProject
\ No newline at end of file
--- a/android/.idea/modules.xml
+++ b/android/.idea/modules.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/AwesomeProject.iml" filepath="$PROJECT_DIR$/AwesomeProject.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
--- a/android/.idea/workspace.xml
+++ b/android/.idea/workspace.xml