From 4f5fa747be9763b99cff93adb7939e4eac774695 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Apr 2012 12:23:30 -0400 Subject: [PATCH] fixed --- doc/bugs/trail_test_suite_failures.mdwn | 2 ++ 1 file changed, 2 insertions(+) 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]] + 
 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
-- 
2.32.0.93.g670b81a890