-
Script Kiddy authoredIn case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
ac12984d
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| mltpreview.cpp | ||
| mltpreview.desktop | ||
| mltpreview.h |