Fixed conflict while merging with develop branch

2014-01-20 17:01:28 +05:30 · 2014-01-20 17:01:28 +05:30 · 719f2803b3
commit 719f2803b3
parent dc15b4fa8a
1 changed files with 0 additions and 4 deletions
--- 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"
 },