Fail if osync_status_conflict gets called and no conflict_callback is registerd. Currently the engine would deadlock, since the obj engine would delay writting until all conflicts got solved.
Fail if osync_status_conflict gets called and no conflict_callback is
registerd. Currently the engine would deadlock, since the obj engine
would delay writting until all conflicts got solved.

Without conflict handler aka. conflict_callback conflicts never get
solved -> deadlock/timeout.



git-svn-id: e31799a7ad59d6ea355ca047c69e0aee8a59fcd3@3044 53f5c7ee-bee3-0310-bbc5-ea0e15fffd5e

luizluca/opensync-luizluca,luizluca/opensync-luizluca