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"
11 years ago · 7f473f22a3
parent a651f9c37c
commit 7f473f22a3
4 changed files with 0 additions and 4 deletions
--- 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
--- 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
--- 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
--- 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