commit 135a4ccabdeae50e7219b9adc0e7af33889a845f
author Anand Doshi <anand@erpnext.com> Thu Feb 21 11:10:36 2013 +0530
committer Anand Doshi <anand@erpnext.com> Thu Feb 21 11:10:36 2013 +0530
tree 05b808eed0e3aa78ddda72a6056da9b2802bbd9f
parent 59d8a76e607ee2a4f2106ae9228ae9657ccb9862

changed modified of global defaults.txt after merge conflict

setup/doctype/global_defaults/global_defaults.txt

diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt
index 7ab8bae..960da7e 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"
  },