Skip a merge.

- Legacy-Id: 10744
2016-01-26 21:58:38 +00:00 · 2016-01-26 21:58:38 +00:00 · 93554376e4
parent 8d565f5fb7
commit 93554376e4
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -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