lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-13 07:29:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
indico-plugins/.gitattributes
Adrian Moennich 3b56d304c4 Use union merge for zoom README 
Conflicts are likely in the changelog where this can usually resolve
them.
2020-12-03 12:02:07 +01:00

2 lines
30 B
Plaintext
Raw Blame History

vc_zoom/README.md merge=union
Reference in New Issue View Git Blame Copy Permalink