comparison src/puresize.h @ 108104:17710e3a17df

Remove conflict markers.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 24 Apr 2010 14:33:31 +0200
parents 1d1d5d9bd884
children e16f43875a48 376148b31b5e
comparison
equal deleted inserted replaced
108103:01ca94871a56 108104:17710e3a17df