# include <stdio.h>
#endif
-#include "../libspi/spi-private.h"
+#include <spi-common/spi-dbus.h>
+
#include "registry.h"
#include "dbus/dbus-glib-lowlevel.h"
/* Our parent GObject type */
#define PARENT_TYPE G_OBJECT_TYPE
+<<<<<<< HEAD:registryd/registry.c
+=======
+>>>>>>> 6d509d490749c6bac3149a5ec45862352ffcf290:registryd/registry.c
int _dbg = 0;