diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-10-09 09:48:03 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-10-09 09:48:03 +0000 |
| commit | 3aa034b579f26cef796061f223c5ff37a68ed9f0 (patch) | |
| tree | 3b2b28a4124dd92cfa548a70f23cea17f10f6404 /doc/RecTutorial/manbiblio.bib | |
| parent | aea9ef97a2173d9ff7efc2dcc0aed0c420132b83 (diff) | |
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
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 099e3bbde..26064e864 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}, |