From: Joey Hess <joey@kitenet.net>
Date: Thu, 5 Apr 2012 16:23:30 +0000 (-0400)
Subject: fixed
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4f5fa747be9763b99cff93adb7939e4eac774695

fixed
---

diff --git a/doc/bugs/trail_test_suite_failures.mdwn b/doc/bugs/trail_test_suite_failures.mdwn
index fcb2f0718..a3b7159ec 100644
--- a/doc/bugs/trail_test_suite_failures.mdwn
+++ b/doc/bugs/trail_test_suite_failures.mdwn
@@ -17,6 +17,8 @@ output, which seems to point to an actual bug in the plugin AFAICS. --[[Joey]]
 >> Assuming that wasn't intentional, this is fixed in `smcv/trail`.
 >> --[[smcv]]
 
+>>> Looks like a bad merge of some kind. pulled, [[done]] --[[Joey]]
+
 <pre>
 ok 71 - expected n=sorting/end p=sorting/beginning in sorting/middle.html
 not ok 72 - expected n=sorting/new p=sorting/middle in sorting/end.html