[SCM] konsole packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-23-g2ccd817

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-applications/konsole.git;a=commitdiff;h=3df3fa4

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 3df3fa41f7ee87c120f9f798835086d93089de64
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 4 18:23:24 2014 +0100

    typo
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 9c02bb3..ee1f2b0 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: konsole-kpart (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: x-terminal-emulator
-Conflits: konsole5
+Conflicts: konsole5
 Replaces: konsole5
 Description: X terminal emulator
  Konsole is a terminal emulator built on the KDE Platform. It can contain
@@ -56,7 +56,7 @@ Description: X terminal emulator
 Package: konsole-kpart
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflits: konsole5
+Conflicts: konsole5
 Replaces: konsole5
 Description: Konsole plugin for Qt applications
  Konsole is a terminal emulator built on the KDE Platform. It can contain

-- 
konsole packaging