cdfc7512aa
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 | ||
plasma_importer.py | ||
plasma-scriptengine-dataengine-python.desktop | ||
plasma-scriptengine-runner-python.desktop | ||
plasmascript.py | ||
pydataengine.py | ||
pyrunner.py |