Hi, Please can you resolve the conflicts?
Text conflict in loggerhead/apps/branch.py Text conflict in loggerhead/controllers/revision_ui.py Text conflict in loggerhead/tests/test_controllers.py Gavin. -- https://code.launchpad.net/~xaav/loggerhead/export-tarball/+merge/66408 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~xaav/loggerhead/export-tarball into lp:loggerhead. _______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
