From 2cdc909c52eef7b9e1afaa9a85ff4d0a5708b5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolv=20R=C3=A5en=20rora=40adego=2Eno?= <>
Date: Tue, 9 Aug 2011 16:20:29 +0200
Subject: [PATCH] Still trying to resolve conflicts

bzr revid: rora@adego.no-20110809142029-toaqz7grzvjoybnw
---
 addons/base_vat/base_vat.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 378c52f26a8..5d4f30f63df 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -1105,6 +1105,7 @@ class res_partner(osv.osv):
         #Valid format and valid date
         return True
 
+
     def check_vat_no(self, vat):
         '''
         Check Norway VAT number.See http://www.brreg.no/english/coordination/number.html