Commits · dae786ea0538c852e471fa38ef8a4600a8f37a5a · github.com / shsorbom / kcmsystemd-debian

l10n daemon script authored Apr 27, 2015

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"

dae786ea

l10n daemon script authored Apr 26, 2015

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"

19f1a9fc

l10n daemon script authored Apr 25, 2015

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"

b392c5bc

l10n daemon script authored Apr 18, 2015

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"

b43a418d

Apr 17, 2015
- Fix typo spotted by Freek de Kruijf · 9b75234e
  Yuri Chornoivan authored Apr 17, 2015
  
  9b75234e
Apr 16, 2015
- Add .reviewboardrc · bbe3dfb4
  Ragnar Thomsen authored Apr 15, 2015
  
  bbe3dfb4
Apr 14, 2015

l10n daemon script authored Apr 14, 2015

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"

c0d903da

l10n daemon script authored Apr 13, 2015

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"

4c99bfa3

l10n daemon script authored Apr 12, 2015

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"

c477fce3