com gtk/php-gtk: Fixing the modified lines and mark the bug as fixed: ext/gtk+/gtk.overrides test/bug_gtkcombobox_get_active_ iter.php

Commit:    ef254be4492004ea72d193d6dcbd7243a3842c94
Author:    Christian Weiske <[email protected]>         Mon, 6 Mar 2006 20:56:23 +0000
Parents:   d4eccfcc80573230836b3fd3a9fc6ef43629f185
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=ef254be4492004ea72d193d6dcbd7243a3842c94

Log:
Fixing the modified lines and mark the bug as fixed

Changed paths:
  M  ext/gtk+/gtk.overrides
  M  test/bug_gtkcombobox_get_active_iter.php


Diff:
ef254be4492004ea72d193d6dcbd7243a3842c94
diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides
index e67d326..e816761 100644
--- a/ext/gtk+/gtk.overrides
+++ b/ext/gtk+/gtk.overrides
@@ -1095,8 +1095,6 @@ PHP_METHOD
 }
 %% }}}
 
-<<<<<<< gtk.overrides
-
 %% {{{ GtkComboBox
 
 %%
@@ -1117,10 +1115,6 @@ PHP_METHOD
 
 %% }}}
 
-%% include gtkcontainer.overrides
-
-=======
->>>>>>> 1.153
 %% {{{ GtkDialog
 
 %%
diff --git a/test/bug_gtkcombobox_get_active_iter.php b/test/bug_gtkcombobox_get_active_iter.php
index 3cc3b97..a130920 100644
--- a/test/bug_gtkcombobox_get_active_iter.php
+++ b/test/bug_gtkcombobox_get_active_iter.php
@@ -1,4 +1,5 @@
 <?php
+// FIXED by Christian on 2006-03-06
 $cmb = new GtkComboBox();
 $mod = new GtkListStore(Gtk::TYPE_STRING);
 $cmb->set_model($mod);