From: David <david.dobervich@gmail.com>
Date: Fri, 20 Nov 2015 18:37:17 +0000 (-0800)
Subject: Merge branch 'master' of challenge-bot.com:repos/3501/2015-FRC-Spark
X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=1563c360b0082449d54c8bf0c9e3cf35f7363010;hp=-c;p=3501%2F2015-FRC-Spark

Merge branch 'master' of challenge-bot.com:repos/3501/2015-FRC-Spark
---

1563c360b0082449d54c8bf0c9e3cf35f7363010
diff --combined .gitignore
index 7a58fe3,0686dad..dc8e203
--- a/.gitignore
+++ b/.gitignore
@@@ -1,15 -1,15 +1,18 @@@
 +<<<<<<< HEAD
  # -*- mode: gitignore; -*-
  *~
  \#*\#
  .\#*
 +=======
 +>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
  *.pydevproject
  .metadata
  .gradle
  bin/
  tmp/
+ build/
+ dist/
+ sysProps.xml
  *.tmp
  *.bak
  *.swp
@@@ -46,8 -46,4 +49,8 @@@ local.propertie
  .texlipse
  
  # STS (Spring Tool Suite)
 +<<<<<<< HEAD
  .springBeans
 +=======
 +.springBeans
 +>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e