syntax error

[Mark Johnson]

The trouble is that I have not editted any local files.  It has been a 
few weeks since I did an svn update though.  I suppose this long 
interval must have confused svn.  The svn revert did the trick.  It 
built successfully this morning.

Mark

Derek Atkins wrote:

> This is an svn conflict. It means you changed your local copy and
> the copy in SVN changed as well, but incompatibly.  Just "svn revert"
> to get to the upstream copy, or you can hand-edit the file to fix
> the merge problem.
>
> -derek
>
> Quoting Mark Johnson <mrj001 at shaw.ca>:
>
>> Hi,
>> I am trying to build svn rev.  14357.  I got a syntax error:
>> druid-qif-import.c: In function `gnc_ui_qif_import_select_file_cb':
>> druid-qif-import.c:359: error: syntax error before '<<' token
>>
>> Anybody else seen this?  The section of code looks like this:
>> ...
>>  if (default_dir == NULL)
>>    gnc_init_default_directory(&default_dir);
>> <<<<<<< .mine
>>  new_file_name = gnc_file_dialog (_("Select QIF File"), 
>> "*.[Qq][Ii][Ff]",
>>                  default_dir, GNC_FILE_DIALOG_IMPORT);
>> =======
>> >>>>>>> .r14357
>>
>>  filter = gtk_file_filter_new ();
>> ...
>>
>> I am using gcc version 3.3.6.
>>
>> Mark
>>
>> _______________________________________________
>> gnucash-devel mailing list
>> gnucash-devel at gnucash.org
>> https://lists.gnucash.org/mailman/listinfo/gnucash-devel
>>
>
>
>