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

<<<<<<< HEAD
# -*- mode: gitignore; -*-
*~
\#*\#
.\#*
=======
>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath

# Eclipse Core
.project

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# JDT-specific (Eclipse Java Development Tools)
.classpath

# Java annotation processor (APT)
.factorypath

# PDT-specific
.buildpath

# sbteclipse plugin
.target

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
<<<<<<< HEAD
.springBeans
=======
.springBeans
>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
Commit	Line	Data
	1	<<<<<<< HEAD
	2	# -- mode: gitignore; --
	3	*~
	4	\#*\#
	5	.\#*
	6	=======
	7	>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e
	8	*.pydevproject
	9	.metadata
	10	.gradle
	11	bin/
	12	tmp/
	13	*.tmp
	14	*.bak
	15	*.swp
	16	*~.nib
	17	local.properties
	18	.settings/
	19	.loadpath
	20
	21	# Eclipse Core
	22	.project
	23
	24	# External tool builders
	25	.externalToolBuilders/
	26
	27	# Locally stored "Eclipse launch configurations"
	28	*.launch
	29
	30	# CDT-specific
	31	.cproject
	32
	33	# JDT-specific (Eclipse Java Development Tools)
	34	.classpath
	35
	36	# Java annotation processor (APT)
	37	.factorypath
	38
	39	# PDT-specific
	40	.buildpath
	41
	42	# sbteclipse plugin
	43	.target
	44
	45	# TeXlipse plugin
	46	.texlipse
	47
	48	# STS (Spring Tool Suite)
	49	<<<<<<< HEAD
	50	.springBeans
	51	=======
	52	.springBeans
	53	>>>>>>> fb376f02820fc8dd8404759e2b45fa582969dc3e