From: Kevron Rees <kevron_m_rees@linux.intel.com>
Date: Tue, 25 Sep 2012 22:19:55 +0000 (-0700)
Subject: fixed mergers
X-Git-Tag: submit/release/20120926.232908~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfe8b20edb9c2587dddcde74605b35d71e3a1f0e;p=profile%2Fivi%2Fautomotive-message-broker.git

fixed mergers
---

cfe8b20edb9c2587dddcde74605b35d71e3a1f0e
diff --cc plugins/dbus/properties.h
index c0255a0,9e7d1e0..2276d4d
--- a/plugins/dbus/properties.h
+++ b/plugins/dbus/properties.h
@@@ -27,7 -27,7 +27,7 @@@ class VehicleSpeedProperty: public DBus
  {
  public:
  	VehicleSpeedProperty(AbstractRoutingEngine* re, GDBusConnection* connection)
- 		:DBusSink("org.automotive.vehicleSpeed","/org/automotive/vehiclespeed", re, connection, map<string, string>())
 -		:DBusSink("org.automotive.vehicleSpeed","/org/automotive/runningstatus/vehiclespeed", re, connection)
++		:DBusSink("org.automotive.vehicleSpeed","/org/automotive/runningstatus/vehiclespeed", re, connection, map<string, string>())
  	{
  		wantProperty<uint16_t>(VehicleProperty::VehicleSpeed,"VehicleSpeed", "i", AbstractProperty::Read);
  		supportedChanged(re->supported());