fixed conflict
diff --git a/patches/december_2012/replace_createlocal.py b/patches/december_2012/replace_createlocal.py
new file mode 100644
index 0000000..b37ba6b
--- /dev/null
+++ b/patches/december_2012/replace_createlocal.py
@@ -0,0 +1,4 @@
+def execute():
+ import webnotes
+ webnotes.conn.sql("""update `tabCustom Script`
+ set script = replace(script, 'createLocal', 'wn.model.make_new_doc_and_get_name')""")
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 645f18c..2e8fc5e 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -737,4 +737,8 @@
'patch_module': 'patches.december_2012',
'patch_file': 'file_list_rename',
},
+ {
+ 'patch_module': 'patches.december_2012',
+ 'patch_file': 'replace_createlocal',
+ },
]
\ No newline at end of file