christos 69d47d3022 Resolve conflicts

1999-10-16 07:17:43 +00:00

..

acronyms

RSN real soon now

1999-10-05 05:53:42 +00:00

airport

…

ascii

…

birthtoken

…

bsd-family-tree

…

country

…

domains

…

eqnchar

…

flowers

…

indent.pro

…

inter.phone

…

language

…

Makefile

Remove getopt from the Makefile too.

1999-09-16 09:12:06 +00:00

man.template

…

mdoc.template

…

na.phone

Resolve conflicts

1999-10-16 07:17:43 +00:00

operator

…

style

…

zipcodes

…