Merge lp:~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict into lp:openerp-mgmtsystem/6.1
Proposed by
Sandy Carter (http://www.savoirfairelinux.com)
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 |
Related bugs: |
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