Fri, 18 Apr 2008 00:04:23 +0300 Added face define for conflict.
Oleksander Gavenko <gavenko_a@3g.ua> [Fri, 18 Apr 2008 00:04:23 +0300] rev 14
Added face define for conflict.
(0) -10 -1 +1 +10 +30 +100 +300 +1000 tip