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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_flow/stencils/BPMN=3A_small_fix?=
From:       Yue Liu <opuspace () gmail ! com>
Date:       2011-02-16 8:51:02
Message-ID: 20110216085102.769F4A60CE () git ! kde ! org
[Download RAW message or body]

Git commit 92af902f4cd8a1cd422fe064d4a8d94024fba8b9 by Yue Liu.
Committed on 16/02/2011 at 09:35.
Pushed by liu into branch 'master'.

small fix

M  +0    -8    flow/stencils/BPMN/Task.desktop     

http://commits.kde.org/calligra/92af902f4cd8a1cd422fe064d4a8d94024fba8b9

diff --git a/flow/stencils/BPMN/Task.desktop b/flow/stencils/BPMN/Task.desktop
index 00f2c71..d78f273 100644
--- a/flow/stencils/BPMN/Task.desktop
+++ b/flow/stencils/BPMN/Task.desktop
@@ -1,10 +1,2 @@
 [Desktop Entry]
 Name=Task
-<<<<<<< HEAD
-=======
-Name[cs]=Úloha
-Name[nl]=Taak
-Name[pt_BR]=Tarefa
-Name[uk]=Задача
-Name[x-test]=xxTaskxx
->>>>>>> fc144ab133d8fd038000407594e091d5aa447852


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