From 3aa034b579f26cef796061f223c5ff37a68ed9f0 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Sun, 9 Oct 2011 09:48:03 +0000
Subject: mainbiblio.bib : get rid of merge marker from failed merge

 Thanks to Tom Prince for spotting this

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14530 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 doc/RecTutorial/manbiblio.bib | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'doc/RecTutorial')

diff --git a/doc/RecTutorial/manbiblio.bib b/doc/RecTutorial/manbiblio.bib
index 099e3bbde8..26064e8644 100644
--- a/doc/RecTutorial/manbiblio.bib
+++ b/doc/RecTutorial/manbiblio.bib
@@ -467,11 +467,6 @@ of the {ML} language},
   number = {204},
 }
 
-<<<<<<< biblio.bib
-
-
-=======
->>>>>>> 1.4
 @INPROCEEDINGS{Gir70,
         AUTHOR             = {J.-Y. Girard},
         BOOKTITLE          = {Proceedings of the 2nd Scandinavian Logic Symposium},
-- 
cgit v1.2.3