From 277ab85b2b1db9e670e80e3592b9def306a0dbf2 Mon Sep 17 00:00:00 2001 From: Gilver Date: Sun, 9 Mar 2025 01:32:38 -0600 Subject: [PATCH] chore(.backportrc.json): Drop F39 since it's EOL, add EL10 and F42 (#3823) (#3838)m Signed-off-by: Gilver (cherry picked from commit 77cef24989ade9a6320dcc89c4f22c4c9cd604d5) # Conflicts: # .backportrc.json --- ..backportrc.json.kate-swp | Bin 0 -> 200 bytes .backportrc.json | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 ..backportrc.json.kate-swp diff --git a/..backportrc.json.kate-swp b/..backportrc.json.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..9469161cabec6b93f7b249f3a5400eacbcb3c265 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/.backportrc.json b/.backportrc.json index c09fd186f0..7af0021d2e 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -2,7 +2,11 @@ "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" }