From 719f2803b3ca826860c4bfbbbe374bc613e733c6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 20 Jan 2014 17:01:28 +0530 Subject: [PATCH] Fixed conflict while merging with develop branch --- .../doctype/stock_reconciliation/stock_reconciliation.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt index 0a639d5e74..6f9d04d492 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" },