summaryrefslogtreecommitdiffstats
path: root/src/svnqt/conflictdescription.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2021-03-19 10:06:06 +0900
committerMichele Calgaro <[email protected]>2021-03-19 10:10:59 +0900
commiteb8fa2d68a46e05c52d67e98abb60e9bb70cfa6c (patch)
treeed685a6c70bc5742159b8a9bdd958d62406fdfe0 /src/svnqt/conflictdescription.cpp
parenta7413f700bbf107677b27816e25df21384be55ce (diff)
downloadtdesvn-eb8fa2d68a46e05c52d67e98abb60e9bb70cfa6c.tar.gz
tdesvn-eb8fa2d68a46e05c52d67e98abb60e9bb70cfa6c.zip
Renaming of files in preparation for code style tools.r14.0.10
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 283bc34244d24be02e90b767a82826a4ca8da186)
Diffstat (limited to 'src/svnqt/conflictdescription.cpp')
-rw-r--r--src/svnqt/conflictdescription.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svnqt/conflictdescription.cpp b/src/svnqt/conflictdescription.cpp
index 2ccaf38..1dc4e5d 100644
--- a/src/svnqt/conflictdescription.cpp
+++ b/src/svnqt/conflictdescription.cpp
@@ -17,8 +17,8 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "conflictdescription.hpp"
-#include "svnqt_defines.hpp"
+#include "conflictdescription.h"
+#include "svnqt_defines.h"
#include <svn_wc.h>