Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework

[platform/core/uifw/at-spi2-atk.git] / registryd / registry.c

diff --git a/registryd/registry.c b/registryd/registry.c
index 3dc13d6..92b481f 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -39,6 +39,10 @@
 
 /* Our parent GObject type  */
 #define PARENT_TYPE G_OBJECT_TYPE
+<<<<<<< HEAD:registryd/registry.c
+=======
+
+>>>>>>> 6d509d490749c6bac3149a5ec45862352ffcf290:registryd/registry.c
 
 int _dbg = 0;