[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-11-ge2294ed60

[wwp at claws-mail.org]

The branch, gtk2 has been updated
       via  e2294ed603b53b98ca831376146c81ee1704134b (commit)
      from  2fcb6781d714a2533e9fd42397aebe2027e19ece (commit)

Summary of changes:
 src/summaryview.c | 6 ------
 1 file changed, 6 deletions(-)


- Log -----------------------------------------------------------------
commit e2294ed603b53b98ca831376146c81ee1704134b
Author: wwp <subscript at free.fr>
Date:   Tue Dec 19 18:53:17 2023 +0100

    fix paste errors introduced in 029e2af192546b4e361b1d1229ddb406a36a8a24 (and a mismerge).

diff --git a/src/summaryview.c b/src/summaryview.c
index 702b90bd7..08791506f 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1343,14 +1343,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item, gboolean avoid
 		gboolean changed = FALSE;
 
 		val = alertpanel(_("Process mark"),
-<<<<<<< HEAD
 				 _("Some marks are left. Process them?"),
 				 GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL, ALERTFOCUS_FIRST);
-=======
-				 _("Some Mark are left. Process them?"),
-				 NULL, _("_No"), NULL, _("_Yes"), NULL, _("_Cancel"),
-				 ALERTFOCUS_FIRST);
->>>>>>> 07245a4ad (revert menu label changes, give translators context instead)
 		if (G_ALERTALTERNATE == val) {
 			summary_unlock(summaryview);
 			summary_execute(summaryview);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail