fix(i18n): Corrected grammar
Reported on Transifex
/compile
@szaimen How to solve this?
Conflicting files dist/files-main.js dist/files-main.js.map
@rakekniven this needs a manual rebase and then you can run the compile command again
Can someone help to get this merged?
Please merge it now.
@rakekniven can you rebase the pr and fix conflicts or recreate it from master?
@rakekniven can you rebase the pr and fix conflicts or recreate it from master?
Hello, my PR was working when I created it. I have no rebase button this time in the web UI here. Why is it so difficult to apply such tiny changes?
Why is it so difficult to apply such tiny changes?
Because of the compiled js
Why is it so difficult to apply such tiny changes?
Because of the compiled js
Isn't this done by switch "compile amend"?
Isn't this done by switch "compile amend"?
No, because that command cannot resolve conflicts
/compile