diff --git a/.gitignore b/.gitignore index b704047c..b1a284a6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,12 @@ local.properties .DS_Store *~ *.iml +*.orig +*.rej .gradle /local.properties /.idea/workspace.xml /.idea/libraries -.DS_Store build /captures .externalNativeBuild