Remove merge conflict markers from switch_core.c#16

markjcrane merged 1 commit into1.10.12fusionpbx/freeswitch:1.10.12from

markjcrane-patch-1fusionpbx/freeswitch:markjcrane-patch-1Copy head branch name to clipboard