From e6a68106a2a9609225cff148055c66d334f6e74f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@src.gnome.org>
Date: Sat, 30 Aug 2008 20:31:10 +0000
Subject: [PATCH] Don't lose on NULL shlib

svn path=/trunk/; revision=542
---
 gtypelib.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gtypelib.c b/gtypelib.c
index 3940a329d..cc62b47a4 100644
--- a/gtypelib.c
+++ b/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;