From 93554376e4936e9d95ba80d288f06f5482fc7e09 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 26 Jan 2016 21:58:38 +0000 Subject: [PATCH] Skip a merge. - Legacy-Id: 10744 --- hold-for-merge | 1 + 1 file changed, 1 insertion(+) diff --git a/hold-for-merge b/hold-for-merge index bbb00a831..2730a2261 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,6 @@ # -*- conf-mode -*- +/personal/rcross/v6.8.1.dev0@10727 # Loads of whitespace changes. Pyflakes issue already fixed /personal/lars/6.11.1.dev0@10537 # Downgrades the PT fonts to a limited unicode range, renames them, and removes copyright from css file. branch/iola/event-saving-refactor-r10076 @ 10190 branch/amsl/liaisons@10160 # Merged as branch/amsl/liaisons/6.4.1 @ 10160