projects
/
3501
/
2015-FRC-Spark
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of challenge-bot.com:repos/3501/2015-FRC-Spark
[3501/2015-FRC-Spark]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 0686dad847402fbf6a328b8b8fda535f9e62358f..dc8e203a70f816ab5940294cffd44045fb13c78e 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-1,7
+1,10
@@
+<<<<<<< HEAD
# -*- mode: gitignore; -*-
*~
\#*\#
.\#*
# -*- mode: gitignore; -*-
*~
\#*\#
.\#*
+=======
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
*.pydevproject
.metadata
.gradle
*.pydevproject
.metadata
.gradle
@@
-46,4
+49,8
@@
local.properties
.texlipse
# STS (Spring Tool Suite)
.texlipse
# STS (Spring Tool Suite)
+<<<<<<< HEAD
.springBeans
.springBeans
+=======
+.springBeans
+>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e