Now up to 3 conflicts:
Text conflict in nova/tests/fake_flags.py Text conflict in nova/wsgi.py Text conflict in tools/pip-requires 3 conflicts encountered.
Setting to WIP in accordance with the policy Vish proposed.
« Back to merge proposal
Now up to 3 conflicts:
Text conflict in nova/tests/ fake_flags. py
Text conflict in nova/wsgi.py
Text conflict in tools/pip-requires
3 conflicts encountered.
Setting to WIP in accordance with the policy Vish proposed.