OpenERP Management System

Merge lp:~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict into lp:openerp-mgmtsystem/6.1

  1. IGNOREME_cause_conflict
  2. Merge into 6.1
Status: Work in progress
Proposed branch: lp:~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict
Merge into: lp:openerp-mgmtsystem/6.1
Diff against target: 15 lines (+4/-0) (has conflicts)
1 file modified
mgmtsystem_audit/__openerp__.py (+4/-0)
Text conflict in mgmtsystem_audit/__openerp__.py
To merge this branch: bzr merge lp:~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict
Reviewer Review Type Date Requested Status
Sandy Carter (http://www.savoirfairelinux.com) Pending
Review via email: mp+216479@code.launchpad.net

Description of the change

Ignore this MP,
I am testing automatic reviews of MPs and I need a branch with a merge conflict

To post a comment you must log in.

Unmerged revisions

45. By Sandy Carter (http://www.savoirfairelinux.com)

Force a merge conflict

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mgmtsystem_audit/__openerp__.py'
--- mgmtsystem_audit/__openerp__.py 2013-05-31 22:06:41 +0000
+++ mgmtsystem_audit/__openerp__.py 2014-04-18 19:14:27 +0000
@@ -20,7 +20,11 @@
20##############################################################################20##############################################################################
21{21{
22 "name" : "Management System - Audit",22 "name" : "Management System - Audit",
23<<<<<<< TREE
23 "version" : "1.2",24 "version" : "1.2",
25=======
26 "version" : "1.x",
27>>>>>>> MERGE-SOURCE
24 "author" : "Savoir-faire Linux",28 "author" : "Savoir-faire Linux",
25 "website" : "http://www.savoirfairelinux.com",29 "website" : "http://www.savoirfairelinux.com",
26 "license" : "AGPL-3",30 "license" : "AGPL-3",