annotate contrib/favicon.ico @ 2552:bb403d427974

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:28:31 +0200
parents 0bf11906df28
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1277
0bf11906df28 Add a favicon.ico, small version of the main HG image.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff changeset
1 (binary:image/vnd.microsoft.icon)