From e2df75b842334878f0b234eed6613544f102af48 Mon Sep 17 00:00:00 2001 From: Logan Rathbone Date: Thu, 26 Jan 2023 19:44:25 -0500 Subject: tree: Remove conflict marker left in file during merge. --- src/tree.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tree.c b/src/tree.c index 644274d..163e90a 100644 --- a/src/tree.c +++ b/src/tree.c @@ -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); } -- cgit v1.2.1