[FIX] broken merge hidden by leftover pyc file

bzr revid: xmo@openerp.com-20131014121319-ry0s5tnpz5f21aw0
2013-10-14 14:13:19 +02:00
parent a3c11bedb8
commit 5c75678f94
1 changed files with 0 additions and 1 deletions
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-

-import ir_fields
 import ir_ui_view
 import website
 import ir_rule