Anton Shestakov <engored@ya.ru>, Sun, 21 Dec 2014 18:00:24 +0800
git prompt session: demonstrate merge with conflicts
fonts/local.conf
Permissions: -rw-r--r--
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
<edit mode="assign" name="rgba">
<edit mode="assign" name="hinting">
<edit mode="assign" name="hintstyle">
<edit mode="assign" name="antialias">
<edit mode="assign" name="lcdfilter">