tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2021-03-13 06:41:47 +01:00
parent a75da62f4d
commit 5ea3e44705
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/connectivity-report/kdeconnect_connectivity_report.json
View file

@ -1,4 +1,3 @@
{ {
"KPlugin": { "KPlugin": {
"Authors": [ "Authors": [