merge conflicts removed

8 years ago · e65839160b
parent 8c100bb62e
commit e65839160b
1 changed files with 0 additions and 1 deletions
--- a/bibliobase.bib
+++ b/bibliobase.bib
@ -69055,4 +69055,3 @@ author = {Leslie London},
  year={2005},
  publisher={Routledge}
 }
->>>>>>> 906d801fcbc14a38751629a00bedd610e211f3fa