kdeconnect-kde/data
l10n daemon script 2cbb5dfc93 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"
2022-09-05 02:46:13 +00:00
..
CMakeLists.txt Use undeprecated install dirs 2022-04-21 00:50:14 +02:00
kdeconnect-dde.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-05 02:46:13 +00:00
kdeconnect-thunar.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-05 02:46:13 +00:00
kdeconnect.contract Add contract file 2018-11-02 03:00:39 +01:00
org.kde.kdeconnect.metainfo.xml GIT_SILENT made messages (after extraction) 2022-09-05 02:10:34 +00:00
org.kde.kdeconnect_open.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-05 02:46:13 +00:00