diff --git a/.gitignore b/.gitignore index b28e2b1..9ab3b92 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /captures .externalNativeBuild ======= +>>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42 # Compiled class file *.class @@ -32,4 +33,7 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +<<<<<<< HEAD >>>>>>> 2c33f0b33a0411efd93a4810de5061a473835ff5 +======= +>>>>>>> eee131cea39d27218fc7d1c3d641d617d377af42