Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit ff4781de authored by Script Kiddy's avatar Script Kiddy

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"
parent 267393d4
......@@ -10,7 +10,6 @@
"Name[de]": "Sven Brauch",
"Name[en_GB]": "Sven Brauch",
"Name[es]": "Sven Brauch",
"Name[et]": "Sven Brauch",
"Name[fi]": "Sven Brauch",
"Name[fr]": "Sven Brauch",
"Name[gl]": "Sven Brauch",
......
......@@ -10,7 +10,6 @@
"Name[de]": "Sven Brauch",
"Name[en_GB]": "Sven Brauch",
"Name[es]": "Sven Brauch",
"Name[et]": "Sven Brauch",
"Name[fi]": "Sven Brauch",
"Name[fr]": "Sven Brauch",
"Name[gl]": "Sven Brauch",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment