talons

commit d9962727c2269428d2e503b0511742f2a15fdbf3
parent b079ed3f2c025375a9bffb949fb1abad3b86bd1e
Author: paul <paul@claws-mail.org>
Date:   Tue, 12 May 2020 19:16:35 +0100

fix conflict

Diffstat:
M
src/mbox.c
 | 
4
----

1 file changed, 0 insertions(+), 4 deletions(-)
diff --git 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