[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] utilities/maintenance: fix broken patch apply
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2012-02-01 0:14:21
Message-ID: 20120201001421.95CD2A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 09dfaebae1c7ccdaae8541412dd48b2ba7176ea2 by Patrick Spendrin.
Committed on 01/02/2012 at 01:14.
Pushed by sengels into branch 'master'.

fix broken patch apply

M  +0    -3    utilities/maintenance/maintenancedlg.h

http://commits.kde.org/digikam/09dfaebae1c7ccdaae8541412dd48b2ba7176ea2

diff --git a/utilities/maintenance/maintenancedlg.h b/utilities/maintenance/maintenancedlg.h
index 5fb1e7a..736d86b 100644
--- a/utilities/maintenance/maintenancedlg.h
+++ b/utilities/maintenance/maintenancedlg.h
@@ -30,12 +30,9 @@
 
 // Local includes
 
-<<<<<<< HEAD
 #include "digikam_export.h"
 #include "maintenancesettings.h"
 
-=======
->>>>>>> 5675e1f0e2474ce294d26d4ff7bc9ea061737fe0
 namespace Digikam
 {
 
[prev in list] [next in list] [prev in thread] [next in thread]