From a937200b94444617b48f7c9d001b4d313e210716 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 3 Sep 2021 18:08:51 +0000
Subject: [PATCH] adjusted merge queue  - Legacy-Id: 19325

---
 hold-for-merge | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hold-for-merge b/hold-for-merge
index 2bd96fb85..c1dbb8464 100644
--- a/hold-for-merge
+++ b/hold-for-merge
@@ -1,11 +1,14 @@
 # -*- conf-mode -*-
 
+# Everyting below this line is OBE
+
+/personal/rjs/7.36.1.dev0@19302 # Handled this in an earlier merge
+
 /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
 /personal/markd/7.22.1.dev0@18859 # Will need to address differently - too much lag during migration for production