commit ec9fb67d8471ecf4cd642771d481be2b473f40bb
author Nabin Hait <nabinhait@gmail.com> Tue Mar 25 16:53:50 2014 +0530
committer Nabin Hait <nabinhait@gmail.com> Tue Mar 25 16:53:50 2014 +0530
tree c988ba956cc4d760ddabb01610a7a8216717335f
parent 221a8fff1cd8b4d04d129d0284f68fca0617c6db
parent 7fbdba02abbf2f327358641dbfa77ae722f9b461

fixed conflict

erpnext/patches/4_0/countrywise_coa.py

diff --git a/erpnext/patches/4_0/countrywise_coa.py b/erpnext/patches/4_0/countrywise_coa.py
index bddb279..b967d54 100644
--- a/erpnext/patches/4_0/countrywise_coa.py
+++ b/erpnext/patches/4_0/countrywise_coa.py
@@ -16,8 +16,11 @@
 		frappe.db.sql("""update tabAccount set account_type=%s 
 			where account_type=%s""", (new, old))	
 
-	frappe.db.sql("""update `tabAccount` set report_type = 
-		if(is_pl_account='Yes', 'Profit and Loss', 'Balance Sheet')""")
+	try:
+		frappe.db.sql("""update `tabAccount` set report_type = 
+			if(is_pl_account='Yes', 'Profit and Loss', 'Balance Sheet')""")
 			
-	frappe.db.sql("""update `tabAccount` set balance_must_be=debit_or_credit 
-		where ifnull(allow_negative_balance, 0) = 0""")
\ No newline at end of file
+		frappe.db.sql("""update `tabAccount` set balance_must_be=debit_or_credit 
+			where ifnull(allow_negative_balance, 0) = 0""")
+	except:
+		pass