Conflict:

git diff
diff --cc addons/stock/__openerp__.py
index 2eed8f6,12f42a4..0000000
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@@ -95,7 -95,7 +95,11 @@@ Dashboard / Reports for Warehouse Manag
          'test/opening_stock.yml',
          'test/shipment.yml',
          'test/stock_report.yml',
++<<<<<<< HEAD
 +        'test/stock_move_chain_validation.yml',
++=======
+         'test/setlast_tracking.yml',
++>>>>>>> odoo/7.0
      ],
      'installable': True,
      'application': True,

resolved into

diff --cc addons/stock/__openerp__.py
index 2eed8f6,12f42a4..0000000
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@@ -95,7 -95,7 +95,8 @@@ Dashboard / Reports for Warehouse Manag
          'test/opening_stock.yml',
          'test/shipment.yml',
          'test/stock_report.yml',
 +        'test/stock_move_chain_validation.yml',
+         'test/setlast_tracking.yml',
      ],
      'installable': True,
      'application': True,

Committed by @hbrunn as github.com/OCA/OCB@7be556d3b4

Back to Conflict resolutions OCB synchronization