rhizome/ozfort-server-configs
3
0
Fork 0
mirror of https://github.com/Oldcustard/ozfort-server-configs synced 2025-06-25 23:04:25 +10:00
Code Issues Packages Projects Releases Wiki Activity

change to merge method

Browse Source
This commit is contained in:
Oldcustard 2023-02-26 22:03:35 +11:00
parent b705d4f567
commit ded02f015f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/pull.yml vendored
View File

@ -2,4 +2,4 @@ version: "1"
rules: rules:
- base: master - base: master
upstream: ozfortress:master # change `wei` to the owner of upstream repo upstream: ozfortress:master # change `wei` to the owner of upstream repo
mergeMethod: rebase mergeMethod: merge