mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-08 00:26:37 +08:00
chore(git): keep OpenFlare-owned paths on merge
This commit is contained in:
@@ -1 +1,5 @@
|
|||||||
* -text
|
* -text
|
||||||
|
backend/OpenFlare/** merge=ours
|
||||||
|
frontend/** merge=ours
|
||||||
|
docs/changelog/** merge=ours
|
||||||
|
docs/superpowers/** merge=ours
|
||||||
|
|||||||
Reference in New Issue
Block a user