[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-955-gd9962727c

[paul at claws-mail.org]

The branch, gtk3 has been updated
       via  d9962727c2269428d2e503b0511742f2a15fdbf3 (commit)
      from  b079ed3f2c025375a9bffb949fb1abad3b86bd1e (commit)

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


- Log -----------------------------------------------------------------
commit d9962727c2269428d2e503b0511742f2a15fdbf3
Author: paul <paul at claws-mail.org>
Date:   Tue May 12 19:16:35 2020 +0100

    fix conflict

diff --git a/src/mbox.c b/src/mbox.c
index f857b78f5..cf3d0d363 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -1,10 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-<<<<<<< HEAD
- * Copyright (C) 1999-2019 the Claws Mail team and Hiroyuki Yamamoto
-=======
  * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
->>>>>>> d4db7d121... make the progress window more responsive when importing mbox file
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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


hooks/post-receive
-- 
Claws Mail