- Committer: l10n daemon script
- Date: 2017-11-20 03:37:16 UTC
- Revision ID: git-v1:26c0d4ab441066dd2289b880f74cc522cc6c2925
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"
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"
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
disabled
|
53 | 10 years ago | Martin Klapetek | Disable unused/unavailable services Many of these |
|
||
CMakeLists.txt |
60 | 9 years ago | Aleix Pol | Fix typo | 145 bytes |
|
|