Revision 51c5b735
Added by Cherian Mathew over 8 years ago
| .gitattributes | ||
|---|---|---|
| 1980 | 1980 |
# git config --local merge.ours.driver true |
| 1981 | 1981 |
**/pom.xml merge=ours |
| 1982 | 1982 |
**/MANIFEST.MF merge=ours |
| 1983 |
**/feature.xml merge=ours |
|
| 1983 | 1984 |
eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours |
| 1984 |
eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours |
|
| 1985 |
eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours |
|
| 1986 |
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours |
|
| 1987 |
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours |
|
Also available in: Unified diff
Add missing files to ignore on merge conflict