Updated merge lists.

- Legacy-Id: 10274
2015-10-23 19:14:35 +00:00 · 2015-10-23 19:14:35 +00:00 · 681807528e
parent 7accc69144
commit 681807528e
2 changed files with 3 additions and 1 deletions
--- a/2
+++ b/2
@ -1,5 +1,7 @@
 # -*- conf-mode -*-

+branch/iola/event-saving-refactor-r10076 @ 10190
+
 branch/amsl/liaisons@10160		# Merged as branch/amsl/liaisons/6.4.1 @ 10160
 personal/lars/6.2.1.dev0@9970		# Requires the timeline work
 personal/lars/6.0.5.dev0@9734		# Obsoleted - don't use 'bleach'
--- a/2
+++ b/2
@ -7,7 +7,7 @@

 # --- Add entries at the top ---

-branch/iola/event-saving-refactor-r10076 @ 10190
+
 branch/iola/automatic-doc-name-search-r10126 @ 10158
 branch/iola/docalias-primary-key-r10101 @ 10111
 branch/amsl/liaisons/6.4.1 @ 10098