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, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.Message ID: <kamailio/kamailio/pull/3279/c1321829334@github.com>