Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] remove conflicts

Browse Source
This commit is contained in:
Saurabh 2018-07-18 17:17:20 +05:30
parent d7897f1c53
commit 0bfbf8aa6f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -15,7 +15,6 @@
"engine": "InnoDB", "engine": "InnoDB",
"fields": [ "fields": [
{ {
<<<<<<< HEAD
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -5443,7 +5442,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-12 13:16:20.918322", "modified": "2018-07-18 13:16:20.918322",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",