Fix conflict
authorColin Walters <walters@src.gnome.org>
Sat, 30 Aug 2008 20:31:14 +0000 (20:31 +0000)
committerColin Walters <walters@src.gnome.org>
Sat, 30 Aug 2008 20:31:14 +0000 (20:31 +0000)
commitd3fdde09e9ebcc5da60c7ed8174bdafff445211c
treed0426df983925521e81352daa24723a262f831a0
parentaf6dc7aef40e261d8e57adba6b7972106d047510
Fix conflict

svn path=/trunk/; revision=544
girepository/gtypelib.c