Skip to content

Commit 6c18843

Browse files
hadleyhadley
committed
Merge pull request #913 from krlmlr/gitattributes-NEWS
Avoid merge conflicts in NEWS file
2 parents 1da88f3 + 3aeaa1f commit 6c18843

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

‎.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ visual_test
22
^.*\.Rproj$
33
^\.Rproj\.user$
44
^\.travis\.yml$
5+
^/\.gitattributes$

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/NEWS merge=union

0 commit comments

Comments
 (0)