diff options
author | Logan Rathbone <poprocks@gmail.com> | 2023-01-26 19:44:25 -0500 |
---|---|---|
committer | Logan Rathbone <poprocks@gmail.com> | 2023-01-26 19:44:25 -0500 |
commit | e2df75b842334878f0b234eed6613544f102af48 (patch) | |
tree | 0b83b306832e79395ee198e585de986d5b5cb4bf /src/tree.c | |
parent | e9ca785070f4f1d6f3a2514e8003ef16c7eec6f8 (diff) | |
download | zenity-e2df75b842334878f0b234eed6613544f102af48.tar.gz |
tree: Remove conflict marker left in file during merge.
Diffstat (limited to 'src/tree.c')
-rw-r--r-- | src/tree.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -78,12 +78,8 @@ check_or_radio_label_activated_cb (GtkTreeView *tree_view, /* Because this is a radio list, we should untoggle the previous toggle so * that we only have one selection at any given time */ -<<<<<<< HEAD - if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "radio")) == 1) { -======= if (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model), "radio")) == 1) { ->>>>>>> gtk4-port gtk_tree_model_foreach (model, zenity_tree_dialog_untoggle, NULL); } |