updating develop poms to master versions to avoid merge conflicts
[cdmlib.git] / .gitignore
1 .directory
2 .metadata
3 .classpath
4 .project
5 .settings
6 hibernate.log
7 PUBLIC.xsd
8 dataset.xsd
9 target
10 .umlproject
11 .externalToolBuilders
12 error.log
13 cdmlib-developer.log
14
15 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ResultWrapper.java
16 cdmlib-io/cdmlib-io.uml
17 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/Markup_OLD.java
18 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/schema/PUBLIC.xsd
19 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.xsd
20 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/coreTax.txt
21 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/meta.xml
22 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/vernacular.txt
23 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/CdmImporterTest.xml.edited
24 cdmlib-model/ajcore.*.txt
25 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ParserProblemRange.java
26 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/OrderedTermBaseTest.java
27 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java
28
29 cdmlib-persistence/002_cdm.dll
30 cdmlib-persistence/NewDataSet.xml
31
32 cdmlib-persistence/cdmlib-persistence.uml
33
34 cdmlib-persistence/src/test/resources/Copy[!!-~]of[!!-~]test.cdm.datasource.xml
35 cdmlib-persistence/src/test/resources/dbscripts/Kopie[!!-~]von[!!-~]001_cdm.ddl
36
37 cdmlib-persistence/test.xml
38 cdmlib-print/*odf_output.odf
39
40
41 cdmlib-services/CleanSweepInsertLoadStrategy-debug.xml
42
43 cdmlib-services/cdmlib-services.uml
44 cdmlib-services/src/main/resources/log4j.properties
45
46 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/integrationTest.xml
47
48
49 !cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/ggbn/.settings
50 !cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/.settings
51 !cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v35_36/.settings
52 workbench.xmi