From faecbd03a0c30f7533273bdfde68891e16a51313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 9 Sep 2015 21:24:36 -0700
Subject: [PATCH] Unify and deduplicate gitignores

---
 .gitignore                    |  3 +++
 F-Droid-Privileged/.gitignore | 33 ---------------------------------
 F-Droid/test/.gitignore       | 12 ------------
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 F-Droid-Privileged/.gitignore
 delete mode 100644 F-Droid/test/.gitignore

diff --git a/.gitignore b/.gitignore
index 5ccee93d8..b2bb3aa98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ out
 # Imported libs
 extern/*/libs/
 extern/*/*/libs/
+
+# Tests
+junit-report.xml
diff --git a/F-Droid-Privileged/.gitignore b/F-Droid-Privileged/.gitignore
deleted file mode 100644
index a44cc0f0f..000000000
--- a/F-Droid-Privileged/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-#Android specific
-bin
-gen
-obj
-lint.xml
-local.properties
-release.properties
-ant.properties
-*.class
-*.apk
-
-#Gradle
-.gradle
-build
-gradle.properties
-
-#Maven
-target
-pom.xml.*
-
-#Eclipse
-.project
-.classpath
-.settings
-.metadata
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Lint output
-lint-report.html
-lint-report_files/*
\ No newline at end of file
diff --git a/F-Droid/test/.gitignore b/F-Droid/test/.gitignore
deleted file mode 100644
index b8d12b236..000000000
--- a/F-Droid/test/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/local.properties
-/bin/
-/gen/
-/build/
-/.gradle/
-/build.xml
-*~
-/.idea/
-/*.iml
-out
-/.settings/
-junit-report.xml