natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure no conflicts in build.xml -- employ "ours" strategy.

This commit is contained in:
Fedor Isakov 2019-08-22 15:15:28 +02:00
parent 1b1de4af47
commit c072097fb6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -8,3 +8,5 @@ dependencies text merge=mps
*.mpsr text merge=mps *.mpsr text merge=mps
*.model text merge=mps *.model text merge=mps
*.mps text merge=mps *.mps text merge=mps
build.xml merge=ours