fix merge conflicts

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

diff --git a/.gitignore b/.gitignore
index 880dd9281fdbd8e3255abf3eb84f3df43fa1db70..2040e4c462d34b435fc1819c0821c57e25a58bd6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,21 @@
+<<<<<<< HEAD
+=======
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+.\#*
+>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
 *.pydevproject
 .metadata
 .gradle
 bin/
 tmp/
+<<<<<<< HEAD
+=======
+build/
+dist/
+sysProps.xml
+>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5
 *.tmp
 *.bak
 *.swp
@@ -39,4 +52,8 @@ local.properties
 .texlipse
 
 # STS (Spring Tool Suite)
+<<<<<<< HEAD
 .springBeans
+=======
+.springBeans
+>>>>>>> c7a54f8e92507c36aeefbd99783e0811402b34b5