funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 17:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(backportrc): merge conflicts (#3839)

Browse Source
This commit is contained in:
madomado
2025-03-09 15:35:34 +08:00
committed by GitHub
parent 277ab85b2b
commit d5cf48ebbd
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
..backportrc.json.kate-swp
BIN
View File
Binary file not shown.
.backportrc.json
-4
View File
@@ -2,11 +2,7 @@
"repoOwner": "terrapkg",
"repoName": "packages",
"resetAuthor": true,
<<<<<<< HEAD
"targetBranchChoices": ["f39", "f40", "f41", "f42", "frawhide"],
=======
"targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"],
>>>>>>> 77cef2498 (chore(.backportrc.json): Drop F39 since it's EOL, add EL10 and F42 (#3823))
"branchLabelMapping": {
"^sync-(.+)$": "$1"
}