diff options
| author | Philip Rauwolf <rauwolf@itestra.de> | 2013-10-30 10:19:46 +0100 |
|---|---|---|
| committer | Philip Rauwolf <rauwolf@itestra.de> | 2013-10-30 10:19:46 +0100 |
| commit | 5db81377a5b88464c29dfb37ec2483549a57bf98 (patch) | |
| tree | cf3234ae4d074eb12d0149752eb6fd31285168c8 /src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp | |
| parent | df112482a09ad91e8a2028c4cf691969a2365ff1 (diff) | |
| download | genivi-common-api-dbus-runtime-5db81377a5b88464c29dfb37ec2483549a57bf98.tar.gz | |
Removed merging relics
Diffstat (limited to 'src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp')
| -rw-r--r-- | src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp index 0b6231b..bd41183 100644 --- a/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp +++ b/src/test/commonapi/tests/TestInterfaceDBusStubAdapter.cpp @@ -117,8 +117,6 @@ const char* TestInterfaceDBusStubAdapter::getMethodsDBusIntrospectionXmlData() c "<arg name=\"testEnumExtended2OutValue\" type=\"i\" direction=\"out\" />\n" "<arg name=\"testMapOutValue\" type=\"a{ua(sq)}\" direction=\"out\" />\n" "</method>\n" -<<<<<<< Upstream, based on origin/master -======= "<method name=\"TestArrayOfPolymorphicStructMethod\">\n" "<arg name=\"inArray\" type=\"a(uv)\" direction=\"in\" />\n" "</method>\n" @@ -131,7 +129,6 @@ const char* TestInterfaceDBusStubAdapter::getMethodsDBusIntrospectionXmlData() c "<method name=\"TestStructWithPolymorphicMemberMethod\">\n" "<arg name=\"inStruct\" type=\"(u(uv))\" direction=\"in\" />\n" "</method>\n" ->>>>>>> 3439751 Fixed (de-)serialization of polymorphic structs. Added unit test for polymorphic structs. ; return introspectionData; |