[SCM] milou packaging branch, kubuntu_wily_archive, updated. debian/5.2.2-1-21-gd4db769

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/milou.git;a=commitdiff;h=d4db769

The following commit has been merged in the kubuntu_wily_archive branch:
commit d4db769655fca8cf32426122fec82fdfe27d8140
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jun 30 12:42:38 2015 +0200

    fix merge
---
 debian/copyright | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f4c71fc..62c56f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -85,18 +85,6 @@ License: GPL-3 or LGPL-2.1-QTexception-1.1
  complete text of the GNU General Public License version 3 can be found in
  "/usr/share/common-licenses/GPL-3".
 
-<<<<<<< HEAD
-Files: lib/previews/videos/*
-       plasmoid/*
-       debian/*
-Copyright: 2013-2014 Vishesh Handa <me at vhanda.in>
-           2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
-License: GPL-2.0+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-=======
 Files: debian/*
 Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
 License: LGPL-2.1+
@@ -104,7 +92,6 @@ License: LGPL-2.1+
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
  version 2.1 of the License, or (at your option) any later version.
->>>>>>> master
  .
  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of

-- 
milou packaging