fixed conflict while merging master and live

2026-05-25 07:54:46 +00:00 · 2011-07-28 15:33:42 +05:30
parent 36506a20fa 7ce060ae22
commit f541b746d1
65 changed files with 1980 additions and 1531 deletions
--- a/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
+++ b/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
@@ -3,9 +3,9 @@

 	# These values are common in all dictionaries
 	{
-		'creation': '2011-07-08 11:14:15',
+		'creation': '2011-07-07 17:47:52',
 		'docstatus': 0,
-		'modified': '2011-07-26 00:59:27',
+		'modified': '2011-07-27 13:19:22',
 		'modified_by': 'Administrator',
 		'owner': 'Administrator'
 	},