Don't lose on NULL shlib

svn path=/trunk/; revision=542

diff --git a/girepository/gtypelib.c b/girepository/gtypelib.c
index 3940a32..cc62b47 100644 (file)
--- a/girepository/gtypelib.c
+++ b/girepository/gtypelib.c
@@ -1962,7 +1962,11 @@ _g_typelib_init (GTypelib *typelib)
             }
         }
      
+<<<<<<< HEAD:girepository/gtypelib.c
       if (typelib->module == NULL && shlib != NULL)
+=======
+      if (shlib != NULL && typelib->module == NULL)
+>>>>>>> Don't lose on NULL shlib:girepository/gtypelib.c
         {
          GString *shlib_full;