Commits · 43b7329b4ecf546b1954f91e7c0526aebfe45aab · Education / Cantor

10 Jul, 2020 1 commit

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

Script Kiddy authored Jul 10, 2020

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"

43b7329b

18 Jun, 2020 2 commits

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

Script Kiddy authored Jun 18, 2020

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"

5674e836

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

Script Kiddy authored Jun 18, 2020

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"

3e81757c

17 Jun, 2020 2 commits

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

Script Kiddy authored Jun 17, 2020

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"

b8ee07b6

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

Script Kiddy authored Jun 17, 2020

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"

cc750907

24 Oct, 2018 1 commit

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

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

64c5088d

30 Dec, 2017 1 commit

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

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

8115017b

17 Sep, 2017 1 commit

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

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

019e76b4

01 Aug, 2017 2 commits

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

Script Kiddy authored Aug 01, 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"

c9ab2349

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

Script Kiddy authored Aug 01, 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"

5db9d454

09 Apr, 2017 2 commits

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

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

54340c6e

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

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

42478595

02 Dec, 2016 2 commits

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

Script Kiddy authored Dec 02, 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"

6cf3b620

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

Script Kiddy authored Dec 02, 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"

82362d33

30 Nov, 2016 1 commit

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

Script Kiddy authored Nov 30, 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"

c06fe138

25 Nov, 2016 1 commit

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

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

6ed4e8fd

23 Nov, 2016 1 commit

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

Script Kiddy authored Nov 23, 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"

c1732479

22 Nov, 2016 1 commit

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

Script Kiddy authored Nov 22, 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"

fb13f463

17 Nov, 2016 2 commits

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

Script Kiddy authored Nov 17, 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"

2abf2e0b

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

Script Kiddy authored Nov 17, 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"

b6777e7a

14 Sep, 2016 1 commit

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

Script Kiddy authored Sep 14, 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"

7e926426

31 Mar, 2016 1 commit

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

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

86dbc112

30 Mar, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 7473e3fb
  Script Kiddy authored Mar 25, 2016
  
  7473e3fb
01 Feb, 2016 1 commit

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

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

5da70668

29 Dec, 2015 1 commit

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

Script Kiddy authored Dec 29, 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"

b64e33f8

09 Dec, 2015 1 commit

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

Script Kiddy authored Dec 09, 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"

1e16bab7

07 Dec, 2015 1 commit

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

Script Kiddy authored Dec 07, 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"

ac6d7d1d

22 Nov, 2015 1 commit

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

Script Kiddy authored Nov 22, 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"

2154f24b

04 Nov, 2015 1 commit

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

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

c2a1c5d0

13 Sep, 2015 1 commit

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

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

2e6fa3c5

25 Aug, 2015 1 commit

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

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

f3abf6ff

22 Aug, 2015 1 commit

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

Script Kiddy authored Aug 22, 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"

d9f78d88

21 Aug, 2015 1 commit

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

Script Kiddy authored Aug 21, 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"

fc5a229a

16 Aug, 2015 1 commit

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

Script Kiddy authored Aug 16, 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"

9ffcc93a

14 Aug, 2015 1 commit

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

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

d8034e79

13 Aug, 2015 1 commit

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

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

7e253a7d

12 Aug, 2015 1 commit

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

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

8a6cf666

11 Aug, 2015 1 commit

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

Script Kiddy authored Aug 11, 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"

98e8bc56

10 Aug, 2015 1 commit

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

Script Kiddy authored Aug 10, 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"

68ba87cb

09 Aug, 2015 1 commit

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

Script Kiddy authored Aug 09, 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"

59fed415