Correct bad merge conflict

2019-02-08 21:18:32 -05:00
parent 272a5400ae
commit 32514dff4c
1 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@ local.properties

 /.idea
 /.gradle
-gradle