mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-09-28 05:46:36 +08:00
chore(git): keep OpenFlare-owned paths on merge
This commit is contained in:
+5
-1
@@ -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