comparison modules/postgresql/postgresql.c @ 5459:413bf5efaedb

Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents f965e31a35f0
children 8bda66cd0414
comparison
equal deleted inserted replaced
5401:4486ba63476b 5459:413bf5efaedb