[minor] remove conflicts

2018-07-18 17:17:20 +05:30 · 2018-07-18 17:17:20 +05:30 · 0bfbf8aa6f
commit 0bfbf8aa6f
parent d7897f1c53
1 changed files with 1 additions and 2 deletions
--- 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",