[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=2e6cdf4

The following commit has been merged in the master branch:
commit 2e6cdf4bd4884fe7330d47b4888f8b7373ee1e53
Author: Andrea Scarpino <andrea at archlinux.org>
Date:   Sat Feb 2 15:00:38 2013 +0059

    Remove invalid entry
---
 filters/formatting/ktptextui_message_filter_formatting.desktop | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/filters/formatting/ktptextui_message_filter_formatting.desktop b/filters/formatting/ktptextui_message_filter_formatting.desktop
index 2fee3c6..950e671 100644
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop
@@ -57,9 +57,6 @@ Comment[wa]=Si siervi di _, * eyet - po rinde les scrijhaedjes clintchîs, crås
 Comment[x-test]=xxUse _, * and - to make text italic, bold or strikeout respectivelyxx
 Comment[zh_CN]=使用 _、* 和 - 来使文本变为斜体、粗体或删除线
 Comment[zh_TW]=用 _, * 與 - 來顯示文字的斜體協、粗體與刪除線。
-<<<<<<< HEAD
-=======
->>>>>>> kde-telepathy-0.5
 Type=Service
 ServiceTypes=KTpTextUi/MessageFilter
 X-KDE-Library=ktptextui_message_filter_formatting

-- 
ktp-text-ui packaging