From 300293c119981054c95182a90c829058530a6b6f Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Sun, 25 Dec 2011 13:19:42 +0100
Subject: Imported Upstream version 8.3.pl3

---
 doc/RecTutorial/manbiblio.bib | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'doc/RecTutorial/manbiblio.bib')

diff --git a/doc/RecTutorial/manbiblio.bib b/doc/RecTutorial/manbiblio.bib
index 099e3bbd..26064e86 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