- Legacy-Id: 8312

Author: levkowetz

hold-for-merge

@@ -1,9 +1,12 @@
+# -*- conf-mode -*-
+
 personal/liudapeng/v5.5.1-dev0@7925	# alternative resolution desired
 personal/rjs/v5.2.0@7544
 personal/liudapeng/v5.0.2@7399
-personal/rcross/v5.4.1@7771	# Already fixed in [7664], in a slightly more future-safe way
+personal/rcross/v5.4.1@7771		# Already fixed in [7664], in a slightly more future-safe way
 personal/liudapeng/v5.6.2-dev0@8129
-personal/sunqi/v5.6.2-dev0@8147 # inapplicable due to edits of prior merge.
-personal/liudapeng/v5.6.2-dev0@8148 # needs more work
-personal/liudapeng/v5.6.2-dev0@8149 # needs more work
-personal/chengang/v5.6.1-dev0@8152 # already fixed earlier
+personal/sunqi/v5.6.2-dev0@8147		# inapplicable due to edits of prior merge.
+personal/liudapeng/v5.6.2-dev0@8148	# needs more work
+personal/liudapeng/v5.6.2-dev0@8149	# needs more work
+personal/chengang/v5.6.1-dev0@8152	# already fixed earlier
+personal/rcross/v5.6.2-dev0@8156	# re-work to use a flag on the meeting model instead of lock file