ccde0558d5
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 | ||
deviceindicator.cpp | ||
deviceindicator.h | ||
indicatorhelper.cpp | ||
indicatorhelper.h | ||
indicatorhelper_mac.cpp | ||
indicatorhelper_win.cpp | ||
Info.plist | ||
main.cpp | ||
Messages.sh | ||
org.kde.kdeconnect.nonplasma.desktop | ||
serviceregister_mac.h | ||
serviceregister_mac.mm |