Resolve conflicts.
authorjbj <devnull@localhost>
Wed, 23 Oct 2002 16:28:08 +0000 (16:28 +0000)
committerjbj <devnull@localhost>
Wed, 23 Oct 2002 16:28:08 +0000 (16:28 +0000)
commitd906129a9a26847f84c63724910b0e1a7f689df0
tree1eae520160c865007f1c0bbeede93b272d2460f0
parent6aba3b12d016a37037164e4ee8152eed7412bf90
Resolve conflicts.

CVS patchset: 5810
CVS date: 2002/10/23 16:28:08
elfutils/po/elfutils.pot
elfutils/tests/asm-tst7.c
elfutils/tests/asm-tst8.c