X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c3d5775757e334e167beed98af01d4e3b2396dd2..cfc5d5d9ed1a5c76212fecd592639aaa3de9b784:/doc/bugs/trail_test_suite_failures.mdwn?ds=inline

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