deleting files not supposed to be in version control

diff --git a/.gitattributes b/.gitattributes
index d4802d634555a57ef85e7210315c8cc6efb53273..6781908b2e89795e47bc826add2a4ad50333b20e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -620,8 +620,6 @@ eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeDesignationWizard.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/type/wizard/TypeListWizard.java -text
 /pom.xml -text
-taxeditor-annotatedlineeditor/.classpath -text
-taxeditor-annotatedlineeditor/.project -text
 taxeditor-annotatedlineeditor/META-INF/MANIFEST.MF -text
 taxeditor-annotatedlineeditor/build.properties -text
 taxeditor-annotatedlineeditor/pom.xml -text

diff --git a/.gitignore b/.gitignore
index 1ea0fa500f5d970ef1f4811e1d19989259259aef..0bc74af1416f6b640239b93b34e570c4d7b6ed5b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/sandbox
+taxeditor-annotatedlineeditor/.settings
 taxeditor-application/.classpath
 taxeditor-application/.project
 taxeditor-application/target

diff --git a/taxeditor-annotatedlineeditor/.classpath b/taxeditor-annotatedlineeditor/.classpath
deleted file mode 100644 (file)
index 240674f..0000000
--- a/taxeditor-annotatedlineeditor/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r

diff --git a/taxeditor-annotatedlineeditor/.project b/taxeditor-annotatedlineeditor/.project
deleted file mode 100644 (file)
index c533e28..0000000
--- a/taxeditor-annotatedlineeditor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>taxeditor-annotatedlineeditor</name>\r
-       <comment>The EDIT Taxonomic Editor for EDIT&apos;s platform for cybertaxonomy</comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.ManifestBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.SchemaBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-               <nature>org.eclipse.pde.PluginNature</nature>\r
-       </natures>\r
-</projectDescription>\r

diff --git a/taxeditor-annotatedlineeditor/pom.xml b/taxeditor-annotatedlineeditor/pom.xml
index bbc7ae931f733b4e698803780bed76c7524e2a72..9f3b11f79af57af0f7ed8c80110e71e1bfd3880b 100644 (file)
--- a/taxeditor-annotatedlineeditor/pom.xml
+++ b/taxeditor-annotatedlineeditor/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   
-    <parent>
+  <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
        <version>2.1</version>