Skip to content
Remove stray SVN conflict delimiter