annotate nt/icons/gnu6w48.ico @ 70111:9f68cc95e2da

Remove conflict marker.
author Romain Francoise <romain@orebokech.com>
date Wed, 19 Apr 2006 06:29:47 +0000
parents 354e0c45cedf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25856
Dave Love <fx@gnu.org>
parents:
diff changeset
1 (binary:image/vnd.microsoft.icon)