Commits · f1e5112620e2a6365aa718c313995645ecb37c4d · Mark Nauwelaerts / Kate

21 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f1e51126

Script Kiddy authored Jan 21, 2019

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"

f1e51126

17 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0f613164

Script Kiddy authored Jan 17, 2019

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"

0f613164

31 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9542b38d

Script Kiddy authored Dec 31, 2018

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"

9542b38d

12 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 224c0b9e

Script Kiddy authored Dec 12, 2018

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"

224c0b9e

10 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7f91a5e2

Script Kiddy authored Dec 10, 2018

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"

7f91a5e2

06 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2ce7aefe

Script Kiddy authored Dec 06, 2018

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"

2ce7aefe

03 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c3b2ab00

Script Kiddy authored Dec 03, 2018

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"

c3b2ab00

29 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9f73bc08

Script Kiddy authored Nov 29, 2018

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"

9f73bc08

26 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · fe8835d8

Script Kiddy authored Nov 26, 2018

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"

fe8835d8

20 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · fe78e279

Script Kiddy authored Nov 20, 2018

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"

fe78e279

18 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d15e79e2

Script Kiddy authored Nov 18, 2018

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"

d15e79e2

17 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0399ba6c

Script Kiddy authored Nov 17, 2018

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"

0399ba6c

14 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 822680f9

Script Kiddy authored Nov 14, 2018

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"

822680f9

13 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b6cd295b

Script Kiddy authored Nov 13, 2018

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"

b6cd295b

12 Nov, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2fc45d0b

Script Kiddy authored Nov 12, 2018

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"

2fc45d0b

11 Nov, 2018 1 commit

Make plugin titles and descriptions consistent in casing and wording · 03d1c987

Gregor Mi authored Nov 11, 2018

Summary:
Before:

{F6414381}

After:

{F6414375}

Note:
- Replicode seems to be unmaintained, see https://github.com/sandsmark/replicode

Reviewers: #kate, #vdg, ngraham

Reviewed By: #vdg, ngraham

Subscribers: dhaumann, ngraham, kwrite-devel

Tags: #kate

Differential Revision: https://phabricator.kde.org/D16647

03d1c987

28 Jul, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 756b1a01

Script Kiddy authored Jul 28, 2018

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"

756b1a01

SVN_SILENT made messages (.desktop file) - always resolve ours · 6839f6ad

Script Kiddy authored Jul 28, 2018

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"

6839f6ad

05 Jun, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e38743ef

Script Kiddy authored Jun 05, 2018

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"

e38743ef

10 May, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 58f61258

Script Kiddy authored May 10, 2018

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"

58f61258

SVN_SILENT made messages (.desktop file) - always resolve ours · 74331150

Script Kiddy authored May 10, 2018

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"

74331150

03 Apr, 2018 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 1920b195

Script Kiddy authored Apr 03, 2018

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"

1920b195

SVN_SILENT made messages (.desktop file) - always resolve ours · aba828b1

Script Kiddy authored Apr 03, 2018

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"

aba828b1

03 Mar, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · b642a531

Script Kiddy authored Mar 03, 2018

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"

b642a531

02 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2be022ce

Script Kiddy authored Oct 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"

2be022ce

25 May, 2017 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 5e066f07

Script Kiddy authored May 25, 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"

5e066f07

SVN_SILENT made messages (.desktop file) - always resolve ours · 022ba9df

Script Kiddy authored May 25, 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"

022ba9df

12 May, 2017 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · b716586f

Script Kiddy authored May 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"

b716586f

SVN_SILENT made messages (.desktop file) - always resolve ours · e4f135bd

Script Kiddy authored May 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"

e4f135bd

23 Apr, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · ca266eed

Script Kiddy authored Apr 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"

ca266eed

15 Mar, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5293fba7

Script Kiddy authored Mar 15, 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"

5293fba7

04 Feb, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 296c9f4b

Script Kiddy authored Feb 04, 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"

296c9f4b

06 Dec, 2016 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 4327e0a6

Script Kiddy authored Dec 06, 2016

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"

4327e0a6

SVN_SILENT made messages (.desktop file) - always resolve ours · f04fed46

Script Kiddy authored Dec 06, 2016

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"

f04fed46

24 Oct, 2016 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9ee94fde

Script Kiddy authored Oct 24, 2016

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"

9ee94fde

04 Oct, 2016 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · dfd653bc

Script Kiddy authored Oct 04, 2016

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"

dfd653bc

07 Sep, 2016 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7d016cab

Script Kiddy authored Sep 07, 2016

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"

7d016cab

12 Aug, 2016 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · bd808d83

Script Kiddy authored Aug 12, 2016

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"

bd808d83

SVN_SILENT made messages (.desktop file) - always resolve ours · 30b9e422

Script Kiddy authored Aug 12, 2016

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"

30b9e422

03 Aug, 2016 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7f6e508d

Script Kiddy authored Aug 03, 2016

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"

7f6e508d