Remove eclipse files and update gitignore files.

cscape · Feb 6, 2018 · 6c23c93 · 6c23c93
1 parent 7bb704a
commit 6c23c93
Show file tree

Hide file tree

Showing 16 changed files with 45 additions and 375 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,14 +3,9 @@
 *.classpath
 *.iml
 .idea/
-
 # Package Files #
 *.jar
 *.war
 *.ear
 /bin/
-<<<<<<< HEAD
-.project
-.classpath
-=======
->>>>>>> 7f9fa2df466fd81ee86c633c4151b0dbb0c583f2
+/.settings/
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
diff --git a/transitclock/.classpath b/transitclock/.classpath
diff --git a/transitclock/.gitignore b/transitclock/.gitignore
@@ -1,9 +1,12 @@
-/bin/
+*.class
+*.project
+*.classpath
+*.iml
+.idea/
+# Package Files #
+*.jar
+*.war
+*.ear
 /target/
-/.settings/
-<<<<<<< HEAD
-.project
-.classpath
-=======
-
->>>>>>> 7f9fa2df466fd81ee86c633c4151b0dbb0c583f2
+/bin/
+/.settings/
diff --git a/transitclock/.project b/transitclock/.project
diff --git a/transitclockApi/.classpath b/transitclockApi/.classpath
diff --git a/transitclockApi/.gitignore b/transitclockApi/.gitignore
@@ -1,7 +1,12 @@
+*.class
+*.project
+*.classpath
+*.iml
+.idea/
+# Package Files #
+*.jar
+*.war
+*.ear
 /target/
-/.settings/
-<<<<<<< HEAD
-/target/
-=======
-
->>>>>>> 7f9fa2df466fd81ee86c633c4151b0dbb0c583f2
+/bin/
+/.settings/
diff --git a/transitclockApi/.project b/transitclockApi/.project
diff --git a/transitclockIntegration/.gitignore b/transitclockIntegration/.gitignore
@@ -1 +1,12 @@
+*.class
+*.project
+*.classpath
+*.iml
+.idea/
+# Package Files #
+*.jar
+*.war
+*.ear
 /target/
+/bin/
+/.settings/
diff --git a/transitclockIntegration/.settings/org.eclipse.jdt.core.prefs b/transitclockIntegration/.settings/org.eclipse.jdt.core.prefs
diff --git a/transitclockIntegration/.settings/org.eclipse.m2e.core.prefs b/transitclockIntegration/.settings/org.eclipse.m2e.core.prefs
diff --git a/transitclockQuickStart/.classpath b/transitclockQuickStart/.classpath
diff --git a/transitclockQuickStart/.gitignore b/transitclockQuickStart/.gitignore
@@ -1 +1,12 @@
+*.class
+*.project
+*.classpath
+*.iml
+.idea/
+# Package Files #
+*.jar
+*.war
+*.ear
 /target/
+/bin/
+/.settings/
diff --git a/transitclockQuickStart/.project b/transitclockQuickStart/.project