From 135a4ccabdeae50e7219b9adc0e7af33889a845f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 21 Feb 2013 11:10:36 +0530 Subject: [PATCH] changed modified of global defaults.txt after merge conflict --- setup/doctype/global_defaults/global_defaults.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt index 7ab8bae9773..960da7e231a 100644 --- a/setup/doctype/global_defaults/global_defaults.txt +++ b/setup/doctype/global_defaults/global_defaults.txt @@ -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" },