kdeconnect-desktop:aniketkumar/kdeconnect-kde-replace-with-basicListItem

Last commit made on 2020-06-27
Get this branch:
git clone -b aniketkumar/kdeconnect-kde-replace-with-basicListItem https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information

Name:
aniketkumar/kdeconnect-kde-replace-with-basicListItem
Repository:
lp:kdeconnect-desktop

Recent commits

22d7be5... by Aniket Kumar <email address hidden>

kirigami 2.6 to kirigami 2.12

1a29ab1... by Aniket Kumar <email address hidden>

replaced with BasicListItem

588c01e... by l10n daemon script <email address hidden>

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

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"

e5c6003... by =?utf-8?q?Jonah_Br=C3=BCchert?= <email address hidden>

app: Elide device name in global drawer

e44e4a4... by l10n daemon script <email address hidden>

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

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"

e046b88... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

653a708... by l10n daemon script <email address hidden>

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

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"

9fc921c... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)

e873edd... by l10n daemon script <email address hidden>

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

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"

c850f59... by l10n daemon script <email address hidden>

GIT_SILENT made messages (after extraction)