Conflict:

diff --cc openerp/addons/base/ir/ir_attachment.py
index 2fc08f7,630cea3..0000000
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@@ -184,12 -184,12 +184,20 @@@ class ir_attachment(osv.osv)
      }
  
      def _auto_init(self, cr, context=None):
++<<<<<<< HEAD
 +        result = super(ir_attachment, self)._auto_init(cr, context)
++=======
+         res = super(ir_attachment, self)._auto_init(cr, context)
++>>>>>>> odoo/7.0
          cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('ir_attachment_res_idx',))
          if not cr.fetchone():
              cr.execute('CREATE INDEX ir_attachment_res_idx ON ir_attachment (res_model, res_id)')
              cr.commit()
++<<<<<<< HEAD
 +        return result
++=======
+         return res
++>>>>>>> odoo/7.0
  
      def check(self, cr, uid, ids, mode, context=None, values=None):
          """Restricts the access to an ir.attachment, according to referred model

caused by github.com/OCA/OCB@409000d versus github.com/odoo/odoo@f4cb884, solved with git merge -X theirs odoo/7.0