From e65839160bde367f67697e9cc07d70dc34babe0d Mon Sep 17 00:00:00 2001
From: Vikas Rawal <vikasrawal@gmail.com>
Date: Fri, 8 Sep 2017 05:50:12 +0530
Subject: [PATCH] merge conflicts removed

---
 bibliobase.bib | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bibliobase.bib b/bibliobase.bib
index d6b8520..2f8d6bc 100644
--- a/bibliobase.bib
+++ b/bibliobase.bib
@@ -69055,4 +69055,3 @@ author = {Leslie London},
   year={2005},
   publisher={Routledge}
 }
->>>>>>> 906d801fcbc14a38751629a00bedd610e211f3fa