Re: [Vim-latex-devel] Re: search for bibtex entry by regexp

[Srinath A. <sri...@gm...>]

Hi Fabian,


On 3/27/06, Fabian Braennstroem <f.b...@gm...> wrote:
> There is a small problem in bibtools.py from line 84:
>
>
>             else:
> <<<<<<< .mine
>                 mn =3D re.search(r',|$', body)
>                 if not mn:
>                     return None
>                 value =3D m.group(2) + body[:(mn.start(0))].rstrip()
> =3D=3D=3D=3D=3D=3D=3D
>                 # $ always matches. So we do not need to do any
>                 # error-checking.
>                 mn =3D re.search(r',|$', body)
>                 value =3D m.group(2) + body[:(mn.start(0))].rstrip()
> >>>>>>> .r1004
>
>
> Those >>>>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D appeared; I do not know if it=
 is bad
> svn usage from me...
>
Those are called "conflict-markers". Basically, since you helped me by
modifying bibtools.py, when you ran ``svn update``, it thought that
there were local modifications to bibtools.py which conflicted with the
remote changes... It's an SVN thingie...

Srinath