deleting files not supposed to be in version control

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 8fc5562dac0fbf673d8c1ebbc79f8c01ff5bcade..d4802d634555a57ef85e7210315c8cc6efb53273 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -652,8 +652,6 @@ taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/SaveAllHandler.java -
 taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/SaveHandler.java -text
 taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java -text
 taxeditor-application/src/main/resources/log4j.properties -text
-taxeditor-bulkeditor/.settings/org.eclipse.jdt.core.prefs -text
-taxeditor-bulkeditor/.settings/org.eclipse.jdt.ui.prefs -text
 taxeditor-bulkeditor/META-INF/MANIFEST.MF -text
 taxeditor-bulkeditor/build.properties -text
 taxeditor-bulkeditor/icons/merge_candidate.gif -text
@@ -662,6 +660,7 @@ taxeditor-bulkeditor/plugin.xml -text
 taxeditor-bulkeditor/pom.xml -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditor.java -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorPartitioner.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorReconcilingStrategy.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineEditorSourceViewerConfiguration.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java -text
@@ -677,6 +676,7 @@ taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/Li
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelection.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelectionSource.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelectionViewer.java -text
+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/SupplementalTextScanner.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/DeleteObjectHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/handler/NewObjectHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java -text
@@ -720,8 +720,6 @@ taxeditor-bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/Application
 taxeditor-bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/ApplicationWorkbenchAdvisor.java -text
 taxeditor-bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/ApplicationWorkbenchWindowAdvisor.java -text
 taxeditor-bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/Perspective.java -text
-taxeditor-editor/.settings/org.eclipse.jdt.core.prefs -text
-taxeditor-editor/.settings/org.eclipse.jdt.ui.prefs -text
 taxeditor-editor/META-INF/MANIFEST.MF -text
 taxeditor-editor/build.properties -text
 taxeditor-editor/icons/edit_16x16.gif -text
@@ -996,7 +994,6 @@ taxeditor-navigation/src/test/java/log4j.properties -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 taxeditor-navigation/src/test/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text
 taxeditor-navigation/src/test/resources/log4j.properties -text
-taxeditor-store/.settings/org.eclipse.jdt.core.prefs -text
 taxeditor-store/META-INF/MANIFEST.MF -text
 taxeditor-store/build.properties -text
 taxeditor-store/icons/256color_16x16.bmp -text