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.
« Back to merge proposal
Hi,
Please can you resolve the conflicts?
Text conflict in loggerhead/ apps/branch. py controllers/ revision_ ui.py tests/test_ controllers. py
Text conflict in loggerhead/
Text conflict in loggerhead/
Gavin.