diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-29 09:42:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-29 09:42:11 +0000 |
| commit | b710f816666416e05954e78682d35f5cba315285 (patch) | |
| tree | 8a261e1e229676b0bccf14d68e10b0e4db1638f8 /setup.py | |
| parent | 3e5f39be2d9ad051d600f9670d4f5fd5208a29c0 (diff) | |
| parent | 2207afc9b9306c19785238f8f02642187f807785 (diff) | |
| download | kolla-b710f816666416e05954e78682d35f5cba315285.tar.gz kolla-b710f816666416e05954e78682d35f5cba315285.zip | |
Merge "Add error message when merge fails"
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions