[balsa/wip/gmime3: 30/197] Save a time-out id and remove the GSource

[Peter Bloomfield <peterb src gnome org>]

commit a931e913519816b8da849c7eaf18b2dec630f376
Author: Albrecht Dreß <albrecht dress arcor de>
Date:   Sat Jul 15 12:21:08 2017 -0400

    Save a time-out id and remove the GSource
    
        * libbalsa/libbalsa-progress.c (revealer_destroy_notify),
        (libbalsa_progress_dialog_update), (remove_progress_widget):
        save a time-out id and remove the GSource if the progress dialog
        is closed before the time-out expires.
    
    Signed-off-by: Peter Bloomfield <PeterBloomfield bellsouth net>

 ChangeLog |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index bf7fa0c..f2c14a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 2017-07-15  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Do not use local variables that shadow other variables
@@ -43,7 +41,6 @@
        * libbalsa/address.c (libbalsa_address_get_edit_widget): do not
        use old style declaration.
 
->>>>>>> 3d41c63... Build with -Wshadow
 2017-07-15  Albrecht Dreß
 
        * libbalsa/libbalsa-progress.c (revealer_destroy_notify),