Fixed Merge issues

[vicar] / src / vicar-telepathy / cpp / connectioninterfacerequestsadaptor.cpp

diff --git a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
index a664283..8050fff 100644 (file)
--- a/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
+++ b/src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
@@ -49,22 +49,14 @@ org::freedesktop::Telepathy::RequestableChannelClassList ConnectionInterfaceRequ
 QDBusObjectPath ConnectionInterfaceRequestsAdaptor::CreateChannel(const QVariantMap &request, QVariantMap &channel_properties)
 {
     // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.CreateChannel
-<<<<<<< HEAD
     //This method should return a Channel object path
     return static_cast<Connection *>(parent())->CreateChannel(request, channel_properties);
-=======
-    //return static_cast<YourObjectType *>(parent())->CreateChannel(request, channel_properties);
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 }
 
 bool ConnectionInterfaceRequestsAdaptor::EnsureChannel(const QVariantMap &request, QDBusObjectPath &channel_object, QVariantMap &channel_properties)
 {
     // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.EnsureChannel
-<<<<<<< HEAD
     //This method should return a Channel object path
     return static_cast<Connection *>(parent())->EnsureChannel(request, channel_object, channel_properties);
-=======
-    //return static_cast<YourObjectType *>(parent())->EnsureChannel(request, channel_object, channel_properties);
->>>>>>> 74800375ecf7f41e290cf7cc7fa9ee8b230be68e
 }