add conflict for broken event dispatcher#40

DavidBadura wants to merge 1 commit into1.5.xpatchlevel/worker:1.5.xfrom

add-confict-for-broken-event-dispatcherpatchlevel/worker:add-confict-for-broken-event-dispatcherCopy head branch name to clipboard