Hold a merge for fix of test failure.

 - Legacy-Id: 13155

Author: levkowetz

hold-for-merge

@@ -1,6 +1,6 @@
 # -*- conf-mode -*-
 
-
+/personal/lars/6.48.2.dev0@13124	# fails drag-and-drop test
 /branch/proceedings/6.29.1.dev0@11850	# Merged into /branch/proceedings/6.30.1.dev0, will be merged from there
 /branch/proceedings/6.29.1.dev0@11856	# Merged into /branch/proceedings/6.30.1.dev0, will be merged from there
 /personal/rcross/6.29.1.dev0@11765	# Merged into ^/personal/rjs/6.29.1.dev0@11770, will be merged from there