Skip to content

Commit 487e0e8

Browse files
wholmgrenwholmgren
authored
set .gitattributes merge=union preference to all whatsnew files instead of only txt
1 parent ed1b474 commit 487e0e8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
pvlib/version.py export-subst
22

33
# reduce the number of merge conflicts
4-
docs/sphinx/source/whatsnew/v*.txt merge=union
4+
docs/sphinx/source/whatsnew/* merge=union

0 commit comments

Comments
 (0)