diff options
Diffstat (limited to 'doc/RecTutorial/manbiblio.bib')
| -rw-r--r-- | doc/RecTutorial/manbiblio.bib | 5 |
1 files changed, 0 insertions, 5 deletions
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}, |