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"
8 lines
193 B
JSON
8 lines
193 B
JSON
{
|
|
"CompositingType": 2,
|
|
"KPlugin": {
|
|
"Description": "KWin Compositor plugin rendering through XRender",
|
|
"Id": "KWinSceneXRender",
|
|
"Name": "SceneXRender"
|
|
}
|
|
}
|