commit 719f2803b3ca826860c4bfbbbe374bc613e733c6
author Nabin Hait <nabinhait@gmail.com> Mon Jan 20 17:01:28 2014 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Jan 20 17:01:28 2014 +0530
tree 817acabb761449593a6e31f04fcd111da3ff844c
parent dc15b4fa8adbf4000d33024b11aff06179d8bda3

Fixed conflict while merging with develop branch

erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt

diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
index 0a639d5..6f9d04d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
@@ -2,11 +2,7 @@
  {
   "creation": "2013-03-28 10:35:31", 
   "docstatus": 0, 
-<<<<<<< HEAD:erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
-  "modified": "2013-12-20 16:06:50", 
-=======
   "modified": "2014-01-15 15:45:07", 
->>>>>>> dbb495548352d46b30bf84fb4b29ef4a247cb21c:stock/doctype/stock_reconciliation/stock_reconciliation.txt
   "modified_by": "Administrator", 
   "owner": "Administrator"
  },