X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=.gitignore;h=7a58fe3c2db27e307ab487fba75f910d2ce3bf69;hb=eb9e6bd8da48f0833680f6e6705542bacacd4dd8;hp=98a068bc2cb62da58e0188b1329e3a88cc8d4935;hpb=de4f822fbfd21dd7421f56b749240e7b11d9bc5c;p=3501%2F2015-FRC-Spark

diff --git a/.gitignore b/.gitignore
index 98a068b..7a58fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
+<<<<<<< HEAD
 # -*- mode: gitignore; -*-
 *~
 \#*\#
 .\#*
+=======
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
 *.pydevproject
 .metadata
 .gradle
@@ -43,4 +46,8 @@ local.properties
 .texlipse
 
 # STS (Spring Tool Suite)
+<<<<<<< HEAD
 .springBeans
+=======
+.springBeans
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e