From 5c75678f94c88b7ad91e45bc8a28b68fc4d8bf76 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 Oct 2013 14:13:19 +0200
Subject: [PATCH] [FIX] broken merge hidden by leftover pyc file

bzr revid: xmo@openerp.com-20131014121319-ry0s5tnpz5f21aw0
---
 addons/website/models/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py
index 23f91ffe9f6..a5710fcf331 100644
--- a/addons/website/models/__init__.py
+++ b/addons/website/models/__init__.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import ir_fields
 import ir_ui_view
 import website
 import ir_rule