commit d9d8dda5dac8a9e91e825ef3fc540b9f57eb92b8
author Saurabh <saurabh6790@gmail.com> Wed Jul 18 17:21:54 2018 +0530
committer GitHub <noreply@github.com> Wed Jul 18 17:21:54 2018 +0530
tree cf436984ca5b5311a86d3940705db4e24d87e405
parent d7897f1c533d0cd86cef33671df2d95fe0d2e7bf
parent 0bfbf8aa6f73e1dae16a3bdf9a37f8a005fef76b

Merge pull request #14954 from saurabh6790/conflict_fixes

[minor] remove conflicts

erpnext/accounts/doctype/sales_invoice/sales_invoice.json

diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 3d261d4..f01caad 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -15,7 +15,6 @@
  "engine": "InnoDB", 
  "fields": [
   {
-<<<<<<< HEAD
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
@@ -5443,7 +5442,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-07-12 13:16:20.918322",
+ "modified": "2018-07-18 13:16:20.918322",
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice",