From 7f473f22a38789527c42f692a774ab8a67bbd8b3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 7 Apr 2015 13:18:55 +0000
Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 cursors/Breeze/Breeze/index.theme | 1 -
 cursors/Breeze/src/index.theme    | 1 -
 icons/index.theme                 | 1 -
 kstyle/breeze.themerc             | 1 -
 4 files changed, 4 deletions(-)

diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme
index 63e0fd75..2cf15206 100644
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@@ -1,7 +1,6 @@
 [Icon Theme]
 Name=Breeze
 Name[ar]=نسيم
-Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
 Name[cs]=Breeze
diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme
index 63e0fd75..2cf15206 100644
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@@ -1,7 +1,6 @@
 [Icon Theme]
 Name=Breeze
 Name[ar]=نسيم
-Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
 Name[cs]=Breeze
diff --git a/icons/index.theme b/icons/index.theme
index 117ba7cf..da92fced 100644
--- a/icons/index.theme
+++ b/icons/index.theme
@@ -1,7 +1,6 @@
 [Icon Theme]
 Name=Breeze
 Name[ar]=نسيم
-Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
 Name[cs]=Breeze
diff --git a/kstyle/breeze.themerc b/kstyle/breeze.themerc
index 7a86e3d1..985f99b5 100644
--- a/kstyle/breeze.themerc
+++ b/kstyle/breeze.themerc
@@ -1,7 +1,6 @@
 [Misc]
 Name=Breeze
 Name[ar]=نسيم
-Name[ast]=Breeze
 Name[bs]=Breeze
 Name[ca]=Brisa
 Name[cs]=Breeze