Revision 8fb2f8c2
Added by Andreas Kohlbecker almost 8 years ago
| .gitattributes | ||
|---|---|---|
| 1 |
pom.xml merge=ours |
|
| 2 |
themes/zen_dataportal/css merge=ours |
|
| 1 | 3 |
* text=auto !eol |
Also available in: Unified diff
| .gitattributes | ||
|---|---|---|
| 1 |
pom.xml merge=ours |
|
| 2 |
themes/zen_dataportal/css merge=ours |
|
| 1 | 3 |
* text=auto !eol |
Also available in: Unified diff
#4979 setting merge=ours in gitattributes to avoid merge conflicts in gitflow