I resolved conflict in src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml
by editing this file and clicking "Mark as resolved"
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3279#issuecomment-1321829334
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3279/c1321829334(a)github.com>