diff options
| author | Bruce Cowan <bruce@bcowan.me.uk> | 2010-05-25 20:27:43 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-05-25 21:46:35 +0200 |
| commit | a538f639b69a39d7bb85b39af2dfd296d28fc0aa (patch) | |
| tree | e2cb258c1fa3f8d212623de2e54b2606f6108df3 /gtk/gtkcombobox.c | |
| parent | 0c6565e1d3ecfae3bca096d554cb8d5378bdfcb0 (diff) | |
| download | gtk+-a538f639b69a39d7bb85b39af2dfd296d28fc0aa.tar.gz | |
Fix conflict Git markers
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=619655
Diffstat (limited to 'gtk/gtkcombobox.c')
0 files changed, 0 insertions, 0 deletions