first commit

pologood · Nov 25, 2015 · 70086ea · 70086ea
1 parent c497fac
commit 70086ea
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,10 @@
+target
+.idea
+*.iml
+<<<<<<< HEAD
+*.empty
+=======
+>>>>>>> 588a9ea3f5bd503be853374f0bbcaac13241c421
+.classpath
+.project
+.settings