This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from bc4db0b9 Merge pull request #691 from xuzhenbao/dfi_unit_test
add d89f0bd2 Add zeromq version conflict in Conan Create CI.
add 41034d81 Fix zeromq version conflict in Conan Create CI.
add 15751847 Add libuuid version conflict in Conan Create CI.
add 64521b71 Add zeromq version conflict in Conan Create CI.
new b70af589 Merge pull request #694 from apache/hotfix/ci-conan
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
conanfile.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)