From 8d36b362d1a462096068c6a140ff592e5ee66579 Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Mon, 7 Jan 2019 15:24:39 +0000
Subject: [PATCH] Merge conflict resolution

---
 .../accounts/doctype/purchase_invoice/purchase_invoice.json   | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 2967bf6d9b4..b9292868298 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -4758,11 +4758,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
-<<<<<<< 31cb24f48d6d57cd8ab6991622c174390f6c2c51
- "modified": "2019-01-07 16:51:59.800081", 
-=======
  "modified": "2018-12-06 09:00:41.508642", 
->>>>>>> WIP
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice",