Fix some rebase breakage.
authorOssama Othman <ossama.othman@intel.com>
Tue, 3 Dec 2013 21:53:40 +0000 (13:53 -0800)
committerOssama Othman <ossama.othman@intel.com>
Tue, 3 Dec 2013 21:53:40 +0000 (13:53 -0800)
commit4bd79878816b30c6159ff209fca9b768cb5ab529
treefb74bd376ca7ed816d26f58ae01a566bf6eca078
parent869e048ef789aaba4c3919e6fa3683bbd01e1c79
Fix some rebase breakage.

Change-Id: I237be501c31514c39da22622dea61b92b2f894ee
Signed-off-by: Ossama Othman <ossama.othman@intel.com>
plugins/connman/connman.cpp
plugins/connman/connman_manager.cpp
plugins/connman/signal_callback.cpp [deleted file]
plugins/connman/signal_callback.hpp [deleted file]
plugins/connman/technology.cpp