Skip to content
Permalink
Browse files
Union merging for CHANGES.txt
  • Loading branch information
Kwpolska committed Apr 15, 2018
1 parent df80757 commit 54cd9631c334ea48ee3493e5fb82ce5ba1dffeac
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitattributes
@@ -0,0 +1 @@
CHANGES.txt merge=union

0 comments on commit 54cd963

Please sign in to comment.