Looks fine to me. The log messages mentions some conflicting files, maybe it makes sense
to merge it manually and adapting the log messages.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/2263#issuecomment-605415114