mollyim/ringrtc
1
0
Fork 0
mirror of https://github.com/mollyim/ringrtc.git synced 2025-05-13 05:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent auto-merge of acknowledgements

Browse source
This commit is contained in:
adel-signal 2023-12-15 13:48:48 -08:00 committed by GitHub
parent a1fa840b1f
commit 2c66d66d2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitattributes vendored Normal file
View file

@ -0,0 +1,3 @@
# Prevent auto-merging of generated acknowledgment files
acknowledgments/acknowledgments.* -merge -text
acknowledgments/acknowledgments.*.hbs merge text=auto