From 3f8536cbcb4bfdf40dbf3e723b4f1cc0032e9f0a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 21 Dec 2018 05:38:52 +0100
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"
---
 colors/BreezeLight.colors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors
index 408652e9..835166d2 100644
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@@ -109,6 +109,7 @@ Name[ca]=Brisa clara
 Name[ca@valencia]=Brisa clara
 Name[de]=Breeze Hell
 Name[es]=Brisa claro
+Name[fr]=Brise claire
 Name[gl]=Breeze claro
 Name[it]=Brezza chiaro
 Name[nl]=Breeze Light