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

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