From: Victor Wagner <vitus@wagner.pp.ru>
Date: Fri, 29 Jan 2016 19:39:10 +0000 (+0300)
Subject: fix merge conflict
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=6cf5300c79ec292d303eb712417f05ab0294a0a8;p=fiction%2FKate-the-Empress.git

fix merge conflict
---

6cf5300c79ec292d303eb712417f05ab0294a0a8