I give the patch https://review.openstack.org/#/c/202886/ But I can't pass the jekins,it said "Patch in Merge Conflict"
I give the patch https:/ /review. openstack. org/#/c/ 202886/
But I can't pass the jekins,it said "Patch in Merge Conflict"