Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Commit

Permalink
Use different merge strategy for changes.md
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbradstreet
lbradstreet committed May 23, 2016
1 parent 62d21eb commit 24624b1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
changes.md merge=union

0 comments on commit 24624b1

Please sign in to comment.