Fix left over merge markers.
authorBart Cerneels <bart.cerneels@kde.org>
Fri, 28 May 2010 20:37:29 +0000 (22:37 +0200)
committerBart Cerneels <bart.cerneels@kde.org>
Fri, 28 May 2010 20:37:29 +0000 (22:37 +0200)
commit3e998ad8546513434acebfe0b2ab67e2fc8c8b4d
tree04410f5f95acc6b25de451470f5d15bea4108ece
parent7e5b12b95cfab07510d3cc12a7ce87f5af0068be
Fix left over merge markers.
tests/core-impl/playlists/types/file/m3u/TestM3UPlaylist.cpp
tests/core-impl/playlists/types/file/m3u/TestM3UPlaylist.h
tests/core-impl/playlists/types/file/pls/TestPLSPlaylist.cpp
tests/core-impl/playlists/types/file/xspf/TestXSPFPlaylist.cpp
tests/core-impl/playlists/types/file/xspf/TestXSPFPlaylist.h
tests/playlistmanager/sql/TestSqlUserPlaylistProvider.h
utilities/updatesigner/signer.h