]> wagner.pp.ru Git - fiction/Kate-the-Empress.git/commit
fix merge conflict
authorVictor Wagner <vitus@wagner.pp.ru>
Fri, 29 Jan 2016 19:39:10 +0000 (22:39 +0300)
committerVictor Wagner <vitus@wagner.pp.ru>
Fri, 29 Jan 2016 19:39:10 +0000 (22:39 +0300)
commit6cf5300c79ec292d303eb712417f05ab0294a0a8
treee380bbee4cc9d49ed7d538fbeeef83b789582ff9
parent2b0c49c9b602770e56ad476deb79d840589d486d
parentf1dff3f13445b727adab871288d39db469f987fb
fix merge conflict