# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1181868618 0
# Node ID a30713de3db9e21a750135690d812edc229110d3
# Parent  3ddc32027e585af50c6ba0f2e616a4548071914c
Set mtn:manual_merge=true on .ico files