shift-shell/dialer
l10n daemon script 55e692fa53 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"
2018-06-16 05:37:17 +02:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-16 05:37:17 +02:00
plugin [dialer] Add KPeople helper plugin 2015-07-15 21:17:35 +02:00
src SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-16 05:37:17 +02:00
CMakeLists.txt [dialer] Add KPeople helper plugin 2015-07-15 21:17:35 +02:00