From 0f1c7731e50b647b56222552f7067f1c4fdc9de0 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 15 Jul 2021 19:29:14 +0000 Subject: [PATCH] Moved 19195 and 19197 out of the mergequeue. - Legacy-Id: 19225 --- hold-for-merge | 5 +++++ ready-for-merge | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hold-for-merge b/hold-for-merge index 27bb46218..2bd96fb85 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,10 @@ # -*- conf-mode -*- +/personal/housley/7.30.1.dev0@19195 # These two should probably be solved with +/personal/housley/7.30.1.dev0@19197 # bringing can_manage_group_type into line + # with can_manage_group, and updates to + # the relevant GroupFeature objects + # Everyting below this line is OBE /personal/rjs/7.29.1.dev0@18992 # commit testing diff --git a/ready-for-merge b/ready-for-merge index f4d58fec7..b55569180 100644 --- a/ready-for-merge +++ b/ready-for-merge @@ -5,8 +5,7 @@ # to this file in trunk/ by the merge master, and it will also be included in # the merge list. -/personal/housley/7.30.1.dev0@19195 -/personal/housley/7.30.1.dev0@19197 +/personal/housley/7.30.1.dev0@19194 # --- Add entries at the top --- #