SVN_SILENT made messages (.desktop file) - always resolve ours
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"
This commit is contained in:
parent
86448c66dd
commit
db3ac9a536
1 changed files with 1 additions and 1 deletions
|
@ -32,4 +32,4 @@
|
||||||
"Name[zh_CN]": "hwcomposer"
|
"Name[zh_CN]": "hwcomposer"
|
||||||
},
|
},
|
||||||
"input": false
|
"input": false
|
||||||
}
|
}
|
Loading…
Reference in a new issue