From 7d66ce36c602676fcbd58a0cc45135c3778ac2d6 Mon Sep 17 00:00:00 2001
From: Vaishali Bansal <vaishali@adzuki>
Date: Mon, 26 Jun 2017 12:47:26 +0530
Subject: [PATCH] iupdate

---
 bibliobase.bib | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bibliobase.bib b/bibliobase.bib
index fb67efe..2e55e16 100644
--- a/bibliobase.bib
+++ b/bibliobase.bib
@@ -62267,6 +62267,7 @@
 }
 
 @PhdThesis{rao2002standing,
+<<<<<<< HEAD
 	Title = {Standing one's ground: gender, land and livelihoods
                   in the Santal Parganas, Jharkhand, {I}ndia},
 	Author = {Rao, Nitya},
@@ -62274,6 +62275,14 @@
 	Year = 2002,
 	Date-added = {2014-04-19 08:46:04 +0000},
 	Date-modified = {2014-04-19 08:46:04 +0000}
+=======
+  Title =        {Standing one's ground: gender, land and livelihoods in the Santal Parganas, Jharkhand, {I}ndia},
+  Author =       {Rao, Nitya},
+  School =       {University of East Anglia},
+  Year =         2002,
+  Date-added =   {2014-04-19 08:46:04 +0000},
+  Date-modified ={2014-04-19 08:46:04 +0000}
+>>>>>>> iupdate
 }
 
 @Article{rao2003mechanisation,