[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: kdebase 3.5 svn - build error at least since Dec 22 !
From:       Jonas Widarsson <jonas () widarsson ! com>
Date:       2006-01-04 9:13:24
Message-ID: 43BB91B4.5040303 () widarsson ! com
[Download RAW message or body]

Ferdinand Gassauer wrote:

>kdmrc-ref.docbook:1: parser error : StartTag: invalid element name
><<<<<<< .mine
>
>  
>
Those are markers for sections of the text that are in CONFLICT because of
changes made localy before "svn up".

They are meant to be resolved manually.

Or are you saying someone commited a file with conflict markers inside?

/Jonas
 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]