]> wagner.pp.ru Git - fiction/Kate-the-Empress.git/commit
Убираем конфликт
authorIrene Emelyanova <irene@wagner.pp.ru>
Fri, 8 Jan 2010 20:54:09 +0000 (20:54 +0000)
committerIrene Emelyanova <irene@wagner.pp.ru>
Fri, 8 Jan 2010 20:54:09 +0000 (20:54 +0000)
commit03f9d1935db4b0f57156cacd412c5e41ce87d4ec
tree0098eab31f67c74575bd6819964d10435e140bfe
parente62308b36c5320b4635af292ebeedaa2ddd6862a
Убираем конфликт
gepard.tex
guard.tex
tallint.tex