CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 00:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14305 from saurabh6790/release_fix

Browse Source 
typo fix
This commit is contained in:
Saurabh
2018-05-31 18:11:53 +05:30
committed by GitHub
parent 0eb622f7da 824e068d0a
commit f9f35d0b76
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -3035,13 +3035,8 @@
"istable": 0,
"max_attachments": 1,
"menu_index": 0,
<<<<<<< HEAD
"modified": "2018-05-17 12:56:20.830562",
"modified_by": "Administrator",
=======
"modified": "2018-05-28 03:23:15.354674",
"modified_by": "Administrator",
>>>>>>> master
"module": "Selling",
"name": "Quotation",
"owner": "Administrator",