Commit ecbf8829 authored by jcnelson's avatar jcnelson

Whoops: remove merge conflict metadata

parent 7370b66b
......@@ -29,10 +29,7 @@
#include <dbus/dbus-connection-internal.h>
#include "connection.h"
<<<<<<< HEAD
=======
#include "driver.h"
>>>>>>> c1c801dcb5e6470e9327195c89ee2da6e505127b
#include "services.h"
#include "utils.h"
......@@ -53,12 +50,9 @@ bus_stats_handle_get_stats (DBusConnection *connection,
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
<<<<<<< HEAD
=======
if (!bus_driver_check_message_is_for_us (message, error))
return FALSE;
>>>>>>> c1c801dcb5e6470e9327195c89ee2da6e505127b
context = bus_transaction_get_context (transaction);
connections = bus_context_get_connections (context);
......@@ -141,12 +135,9 @@ bus_stats_handle_get_connection_stats (DBusConnection *caller_connection,
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
<<<<<<< HEAD
=======
if (!bus_driver_check_message_is_for_us (message, error))
return FALSE;
>>>>>>> c1c801dcb5e6470e9327195c89ee2da6e505127b
registry = bus_connection_get_registry (caller_connection);
if (! dbus_message_get_args (message, error,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment