# for how to use .gitattributes see https://git-scm.com/docs/gitattributes
+# set the default behavior for all files:
* text=auto !eol
pom.xml merge=ours
cdmlib-print/pom.xml merge=ours
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFindDeleted.xml -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml -text
-cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist-result.xml -text
-cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist.xml -text
-cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.testSortindexForJavassist2-result.xml -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/validation/EntityValidationCrudJdbcImplTest.testReplaceError-result.xml -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/validation/EntityValidationCrudJdbcImplTest.testSave.xml -text
cdmlib-services/src/test/resources/unitils.properties -text
/pom.xml -text
src/changes/changes.xml -text
-src/docbkx/ReferenceDocumentation.xml -text
-src/docbkx/annotation-and-markers.xml -text
-src/docbkx/base-classes.xml -text
-src/docbkx/basic-persistence.xml -text
-src/docbkx/free-text-search.xml -text
-src/docbkx/guid-resolution.xml -text
-src/docbkx/identifiable-entities.xml -text
-src/docbkx/resources/css/html.css -text
-src/docbkx/resources/images/ModelOverview20.gif -text
-src/docbkx/resources/images/cdmlib-arch3.png -text
-src/docbkx/resources/images/dao.png -text
-src/docbkx/resources/images/logo.png -text
-src/docbkx/resources/images/service.png -text
-src/docbkx/resources/xsl/cdmlib.xsl -text
-src/docbkx/resources/xsl/fopdf.xsl -text
-src/docbkx/resources/xsl/html_chunk.xsl -text
-src/docbkx/security.xml -text
-src/docbkx/service.xml -text
-src/docbkx/versioning.xml -text
src/site/apt/download.apt -text
src/site/apt/getting-started.apt -text
src/site/apt/index.apt -text