[pLog-svn] r653 - in plog/trunk: class/template/menuclass/view/admin styles templates/admin

[Benjamin Krause]

Hey ..

i tried to reverse merge my changes .. but i get an error from your
svn server.. maybe you can take a look at the log file? or maybe
upgrade your svn module? .. if you dont see any error, i'll merge
the changes back manually ..

benjamin at orkland:/var/files/data/plog/plog> svn merge -r 653:652
plog/trunk/templates/admin/dashboard.template
svn: REPORT request failed on '/svn/plog/!svn/vcc/default'
svn:
Cannot replace a directory from within