Moved 19195 and 19197 out of the mergequeue.

rjsparks · rjsparks · commit 0f1c7731e50b · 2021-07-15T19:29:14.000Z
- Legacy-Id: 19225
diff --git 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
@@ -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 ---
 #

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`# to this file in trunk/ by the merge master, and it will also be included in`
`6`	`6`	`# the merge list.`
`7`	`7`
`8`		`-/personal/housley/7.30.1.dev0@19195`
`9`		`-/personal/housley/7.30.1.dev0@19197`
	`8`	`+/personal/housley/7.30.1.dev0@19194`
`10`	`9`
`11`	`10`	`# --- Add entries at the top ---`
`12`	`11`	`#`