Re: svn bug

Guten Tag Tomas Javurek,
am Dienstag, 25. März 2014 um 16:52 schrieben Sie:

> svn: Commit blocked by pre-commit hook (exit code 1) with
> output:
> Some parts of your commit look suspiciously like merge
> conflict markers. Please double-check your diff and try
> committing again.

There is no bug, your svn admin don't want you to commit this file
because, like the error message says, it look's like a merge conflict.
You should contact your admin and change the used hook if your file
content is valid to commit.

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow