From 830321178ad0b71aea92b1fabaeaa208601ea9ae Mon Sep 17 00:00:00 2001
From: Regis-Gianas
Date: Tue, 4 Nov 2014 20:35:19 +0100
Subject: Rebase artefact.

---
 printing/ppvernac.ml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/printing/ppvernac.ml b/printing/ppvernac.ml
index 7420f2784e..315301d93d 100644
--- a/printing/ppvernac.ml
+++ b/printing/ppvernac.ml
@@ -1222,7 +1222,6 @@ module Make
           return (keyword "BeginSubproof" ++ spc () ++ int i)
         | VernacEndSubproof ->
           return (str "}")
->>>>>>> Ppannotation.t: New constructor AVernac.
 
     and pr_vernac_list l =
       hov 2 (str"[" ++ spc() ++
-- 
cgit v1.2.3