diff etc/LINUX-GNU @ 43168:3d510ec26d69

fix conflict
author Per Abrahamsen <abraham@dina.kvl.dk>
date Thu, 07 Feb 2002 17:33:40 +0000
parents 6b5aacec5ace
children e7d1e0f7a699
line wrap: on
line diff