fixed conflict

patches/december_2012/file_list_rename.py

@@ -0,0 +1,10 @@
+import webnotes
+
+def execute():
+	for dt in webnotes.conn.sql("""select distinct parent from tabDocField 
+		where fieldname='file_list'"""):
+		try:
+			webnotes.conn.sql("""update `tab%s` set file_list = 
+				replace(file_list, "-", "")""" % dt[0])
+		except Exception, e:
+			if e.args[0]!=1146: raise e