From d5cf48ebbdfbe4792cddb7ac62c146dc388f1073 Mon Sep 17 00:00:00 2001
From: madomado <madonuko@outlook.com>
Date: Sun, 9 Mar 2025 15:35:34 +0800
Subject: [PATCH] fix(backportrc): merge conflicts (#3839)

---
 ..backportrc.json.kate-swp | Bin 200 -> 0 bytes
 .backportrc.json           |   4 ----
 2 files changed, 4 deletions(-)
 delete mode 100644 ..backportrc.json.kate-swp

diff --git a/..backportrc.json.kate-swp b/..backportrc.json.kate-swp
deleted file mode 100644
index 9469161cabec6b93f7b249f3a5400eacbcb3c265..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 200
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?VnsrtYqtM|jVN@h)K#&P|&Uwsd4?*|6~
zWjKI128iQ4p&VBr&7`U63YP`)8RA@nLqYNoQFf3J5HNuZU;{H57}!Ay*g+z!K+FWh
cP9PCBh!z$g69jlb*1$N7m8g=85L;MW0XwxD0{{R3

diff --git a/.backportrc.json b/.backportrc.json
index 7af0021d2e..1c5d20bad8 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -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"
   }