piskvorky/askbot-devel — comment on commit 70ba6634b31b2f0be1abd8eb26d9eccf6144a377
File:  line 0
By evgenyfadeev:

In the master branch we moved the template, normally merges apply well if files were moved with `git mv` instead of just `mv` so it should not be a problem.