Re: [Opensync-users] make-Problem with OpenSync PlugIn SynCE

[David E. <tw...@us...>]

On Fri, 2005-09-23 at 15:42 +0200, Stefan Struhs wrote:
> Hi all,
> 
> I am getting the following make error if I try to compile
> opensync-plugin-synce:
> 
> [snip]
>
> The sources are the most recent from the repository.
> 
> I guess, that the problems are caused by some SVN tags, but I am not
> sure, if the compiler (gcc 3.3.6) should ignore these tags. E.g. my
> synce_plugin.h looks like this (clipping):
> 
>         [...]
>         	char		*config_file;
>         <<<<<<< .mine
>         	char		*partnership_id_file;
>         } synce_plugin_environment;
>         =======
>         } SyncePluginPtr;
>         >>>>>>> .r694
>         [...]

Conflict. Hopefully local on your computer, otherwise someone comitted
bad code! :-)

Try to run "svn revert" on the problematic file and see if it helps.

-- 
Regards,
               -\- David Eriksson -/-

        SynCE - http://synce.sourceforge.net
      ScummVM - http://scummvm.sourceforge.net
     Desquirr - http://desquirr.sourceforge.net