Skip to content

Commit

Permalink
new gitattributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Elijahrane
Elijahrane committed May 15, 2022
1 parent edaaf96 commit 82d4f44
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
Resources/Maps/**.yml merge=mapping-merge-driver
*/Maps/*.yml merge=ours
*Rules.txt merge=ours


###############################################################################
# behavior for image files
Expand Down

0 comments on commit 82d4f44

Please sign in to comment.