[Lsb-messages] /srv/www/bzr/lsb/devel/misc-test r2007: repair libchk files which had unnoticed conflict markers

[Mats Wichmann]

------------------------------------------------------------
revno: 2007
committer: Mats Wichmann <mats at freestandards.org>
branch nick: misc-test
timestamp: Fri 2008-09-05 06:37:24 -0600
message:
  repair libchk files which had unnoticed conflict markers
modified:
  libchk/libm_so_6.c
  libchk/libm_so_6_1.c