Revision cdcb5ddf
Added by Ben Stöver about 8 years ago
| .gitattributes | ||
|---|---|---|
| 1975 | 1975 |
src/site/site.xml -text |
| 1976 | 1976 |
|
| 1977 | 1977 |
# The following files will be ignored when merging another |
| 1978 |
# branch into this branch in case of merge conflict and
|
|
| 1978 |
# branch into this branch in case of merge conflict and |
|
| 1979 | 1979 |
# if the 'ours' merge driver is configured. |
| 1980 | 1980 |
# WARNING : This merge driver should NOT be set in development |
| 1981 | 1981 |
# environments. It is supposed to be used only in CI |
| ... | ... | |
| 1987 | 1987 |
**/feature.xml merge=ours |
| 1988 | 1988 |
eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours |
| 1989 | 1989 |
eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours |
| 1990 |
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/ExportSingleReadAlignmentWizardPage.java -text |
|
| 1990 | 1991 |
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours |
| 1991 | 1992 |
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours |
Also available in: Unified diff
Initial version of ExportSingleReadAlignmentWizardPage added.