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