From 8cdaea8b831797c69b19559faaf525b237d36258 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 19 Feb 2009 14:56:20 +0000
Subject: Fix bad merge introduced in commit b006d50

---
diff --git a/girepository/girnode.c b/girepository/girnode.c
index 6d71ebe..744f908 100644
--- a/girepository/girnode.c
+++ b/girepository/girnode.c
@@ -1918,10 +1918,15 @@ g_ir_node_build_typelib (GIrNode    *node,
 				     module, modules, strings, types,
 				     data, offset, offset2);
 	  }
-	else 
+        /* Always do the non-discriminated case */	
+	/*
+	else
 	  {
-	*/
-	/* Always do the non-discriminated case */
+            *offset += 32;
+            blob->discriminated = FALSE;
+            blob->discriminator_type.offset = 0;
+          }  
+        */
 	*offset += sizeof (UnionBlob);
 	blob->discriminated = FALSE;
 	blob->discriminator_type.offset = 0;
--
cgit v0.9.1