Removed stray files.
authorJohan Thelin <johan.thelin@pelagicore.com>
Fri, 21 Feb 2014 09:14:49 +0000 (10:14 +0100)
committerJohan Thelin <johan.thelin@pelagicore.com>
Fri, 21 Feb 2014 09:14:49 +0000 (10:14 +0100)
commit08e6e8fe55de88a75d3eab6a4a34faaba7157756
tree07aa5948549e3eb411f5787a8de7c1c612fc070e
parent147bbc739af454a67407602e1fbdf11f56034de6
Removed stray files.

Removed files left from some old merge conflict.
plugins/websocket/websocketsinkmanager.cpp.orig [deleted file]
plugins/websocketsink/websocketsinkmanager.cpp.orig [deleted file]
plugins/websocketsourceplugin/websocketsource.cpp.orig [deleted file]