GitLab

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"

Updating copyright year as asked in phabricator.kde.org/F6531783

See merge request kde/kdenlive!7

Akhil authored Jan 06, 2019 and Jean-Baptiste Mardelle committed Jan 06, 2019

Differential revision: https://phabricator.kde.org/D17948

BUG: 377184
Differential revision: https://phabricator.kde.org/D17995

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"

Patch by Juku Trump
https://phabricator.kde.org/D17968

Prettify README, convert to Markdown

See merge request kde/kdenlive!2

This broke the build, because it was still expecting the old name.

CCMAIL: cmoulin@inno3.fr

Related to #2

Renaming README to .md for prettier display

See merge request kde/kdenlive!1

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"