cd1d047a3c
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" |
||
---|---|---|
.. | ||
CMakeLists.txt | ||
kdeconnect_mprisremote.json | ||
mprisremoteplayer.cpp | ||
mprisremoteplayer.h | ||
mprisremoteplayermediaplayer2.cpp | ||
mprisremoteplayermediaplayer2.h | ||
mprisremoteplayermediaplayer2player.cpp | ||
mprisremoteplayermediaplayer2player.h | ||
mprisremoteplugin.cpp | ||
mprisremoteplugin.h |