7c13492f2a
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" |
||
---|---|---|
.. | ||
package | ||
%{APPNAMELC}.cpp | ||
%{APPNAMELC}.h | ||
CMakeLists.txt |
7c13492f2a
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" |
||
---|---|---|
.. | ||
package | ||
%{APPNAMELC}.cpp | ||
%{APPNAMELC}.h | ||
CMakeLists.txt |