nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict resolution

Browse Source
This commit is contained in:
Charles-Henri Decultot
2019-01-07 15:24:39 +00:00
parent 4c57fae726
commit 8d36b362d1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -4758,11 +4758,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
<<<<<<< 31cb24f48d6d57cd8ab6991622c174390f6c2c51
"modified": "2019-01-07 16:51:59.800081",
=======
"modified": "2018-12-06 09:00:41.508642", "modified": "2018-12-06 09:00:41.508642",
>>>>>>> WIP
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",