fix conflicts

[3501/2015-FRC-Spark] / .gitignore

diff --git a/.gitignore b/.gitignore
index 227a01040b143d348eaaaddfe59f53c2c2213ec1..7a58fe3c2db27e307ab487fba75f910d2ce3bf69 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+.\#*
+=======
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
 *.pydevproject
 .metadata
 .gradle
@@ -39,4 +46,8 @@ local.properties
 .texlipse
 
 # STS (Spring Tool Suite)
-.springBeans
\ No newline at end of file
+<<<<<<< HEAD
+.springBeans
+=======
+.springBeans
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e