changed modified of global defaults.txt after merge conflict

This commit is contained in:
Anand Doshi 2013-02-21 11:10:36 +05:30
parent 59d8a76e60
commit 135a4ccabd

View File

@ -2,7 +2,7 @@
{
"creation": "2013-02-19 12:28:27",
"docstatus": 0,
"modified": "2013-02-20 14:08:70",
"modified": "2013-02-20 14:09:00",
"modified_by": "Administrator",
"owner": "Administrator"
},