Commits · a576853f0f4cd1fb3ebe05755087f308abb01cf2 · PIM / KMailTransport

Script Kiddy authored Aug 03, 2017

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"

a576853f

Script Kiddy authored Jul 23, 2017

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"

9c7d4917

Script Kiddy authored Jul 18, 2017

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"

1280d70c

Script Kiddy authored Jul 18, 2017

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"

d4174dc7

Script Kiddy authored Jul 17, 2017

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"

c64777b3

Script Kiddy authored Jul 12, 2017

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"

71e08470

Script Kiddy authored Jul 07, 2017

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"

b9963a93

Script Kiddy authored Jul 03, 2017

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"

c148179a

Script Kiddy authored Jul 02, 2017

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"

a68b4588

Script Kiddy authored Jun 30, 2017

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"

8dc26b62

Script Kiddy authored Jun 29, 2017

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"

955c6854