merge-update from trunk

[taxeditor.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 16f460c4b99d21fa091a6aebaeeb815a55d25e84..27491be824972b6cf0ecb342105f03a1ca3860a8 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1006,8 +1006,6 @@ eu.etaxonomy.taxeditor.remoting/.settings/org.eclipse.jdt.core.prefs -text
 eu.etaxonomy.taxeditor.remoting/.settings/org.eclipse.pde.core.prefs -text
 eu.etaxonomy.taxeditor.remoting/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.remoting/build.properties -text
-eu.etaxonomy.taxeditor.remoting/h2/cdmTest.h2.db -text
-eu.etaxonomy.taxeditor.remoting/h2/cdmTest.trace.db -text
 eu.etaxonomy.taxeditor.remoting/pom.xml -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java -text
@@ -1043,6 +1041,8 @@ eu.etaxonomy.taxeditor.remoting/src/test/resources/datasources.xml -text
 eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/cdm/testRemotingApplicationContext.xml -text
 eu.etaxonomy.taxeditor.remoting/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/AbstractLazyInitializerTest.xml -text
+eu.etaxonomy.taxeditor.remoting/src/test/resources/h2/cdmTest.h2.db -text
+eu.etaxonomy.taxeditor.remoting/src/test/resources/h2/cdmTest.trace.db -text
 eu.etaxonomy.taxeditor.remoting/src/test/resources/unitils.properties -text
 eu.etaxonomy.taxeditor.store/.classpath -text
 eu.etaxonomy.taxeditor.store/.project -text