commit 4d3a18890ba395f4eceb81f314ca781b05e37a98
author Sambhaji Kolate <kolate.sambhaji@gmail.com> Mon Sep 15 12:20:11 2014 +0530
committer Sambhaji Kolate <kolate.sambhaji@gmail.com> Mon Sep 15 12:20:11 2014 +0530
tree c123912d5dd5f1110b254d5c649b39168e6248d2
parent b14401c320503f1e8273f29a53b80ac618e6a107

fix conflict

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index e29d3d9..bb393a5 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -886,7 +886,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-09-10 12:26:59.555710", 
+ "modified": "2014-09-09 05:35:32.156763", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 

erpnext/buying/doctype/purchase_order/purchase_order.json

diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 5d36c5c..f16a548 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -772,7 +772,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-09-10 13:23:02.825233", 
+ "modified": "2014-09-10 05:35:32.583024", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order",