sync changes

diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 3533002..5836c33 100644 (file)
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -350,38 +350,24 @@ class Transformer(object):
             value = 'void'
         elif source_type.type == CTYPE_BASIC_TYPE:
             value = source_type.name
-<<<<<<< HEAD
-<<<<<<< HEAD
             # skip adding invalid types.
-=======
             # share the const down the tree..
->>>>>>> 0abc74b... [TYPEDEF] revert change that broke build
             if not source_type.base_type:
                 return value
             value_add = self._create_source_type(source_type.base_type)
             if len(value_add):
                 value += ' ' + value_add
-=======
-            if source_type.base_type:
-                value += ' ' + self._create_source_type(source_type.base_type)
->>>>>>> f2cc056... [TYPEDEF] transformer.py - revert last bad fix
         elif source_type.type == CTYPE_TYPEDEF:
             value = source_type.name
         elif source_type.type == CTYPE_ARRAY:
             return self._create_source_type(source_type.base_type)
         elif source_type.type == CTYPE_POINTER:
             value = self._create_source_type(source_type.base_type) + '*'
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
         elif source_type.type == CTYPE_STRUCT:
             value = source_type.name
->>>>>>> 0abc74b... [TYPEDEF] revert change that broke build
         elif source_type.type == CTYPE_INVALID:
             #this happens if const is after the type..
             value = ''
-=======
->>>>>>> f2cc056... [TYPEDEF] transformer.py - revert last bad fix
         else:
             value = 'any'
         return value