summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDico Karssiens <dico.karssiens@gmail.com>2019-01-10 18:52:51 +0000
committerDico Karssiens <dico.karssiens@gmail.com>2019-01-10 18:52:51 +0000
commit37fa1f9bbfc852dfa67862cde3d11a4e5415db11 (patch)
tree9350ab43d11b294cd7218fec3b61fa83ea3beda8 /.gitignore
parentd80f69488656485a8b93b4982e678ed62c5df96b (diff)
parent778e301efc09eb8326146a084bb6788be748e6f1 (diff)
Merge upstreamHEADmaster
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 601cc7d..60f7508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ build/
/debug/
target/
/gradle-output.txt
-/*.java \ No newline at end of file
+/*.java
+*.dump \ No newline at end of file