mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 16:04:46 +00:00
changed modified of global defaults.txt after merge conflict
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
{
|
{
|
||||||
"creation": "2013-02-19 12:28:27",
|
"creation": "2013-02-19 12:28:27",
|
||||||
"docstatus": 0,
|
"docstatus": 0,
|
||||||
"modified": "2013-02-20 14:08:70",
|
"modified": "2013-02-20 14:09:00",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"owner": "Administrator"
|
"owner": "Administrator"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user