4 Commits

Author	SHA1	Message	Date
Alexey Kudravtsev	901ef122e4	@Override inserted	2010-09-30 10:35:32 +04:00
anna	5d869f823b	cleanup: replace unnamed RuntimeException with dedicated ConflictException	2009-10-28 14:07:51 +03:00
anna	3973debce5	show conflicts unification; ... encapsulate fields: rise conflicts; tests	2009-10-27 12:23:55 +03:00
Dmitry Jemerov	ec70eb1bc1	test++	2009-09-11 16:47:10 +04:00