Prevent auto-merge of acknowledgements
This commit is contained in:
parent
a1fa840b1f
commit
2c66d66d2d
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
# Prevent auto-merging of generated acknowledgment files
|
||||
acknowledgments/acknowledgments.* -merge -text
|
||||
acknowledgments/acknowledgments.*.hbs merge text=auto
|
||||
Loading…
Reference in New Issue
Block a user