Merge lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211 into lp:ubuntu/lucid/libubuntuone
Proposed by
James Westby
Status: | Merged |
---|---|
Merge reported by: | James Westby |
Merged at revision: | not available |
Proposed branch: | lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211 |
Merge into: | lp:ubuntu/lucid/libubuntuone |
Diff against target: |
104 lines (+93/-0) (has conflicts) 1 file modified
debian/changelog (+93/-0) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211 |
Related bugs: |
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/libubuntuone now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/libubuntuone/lucid-201004082211. A merge should be performed if necessary.
To post a comment you must log in.