Commit e51d1d1d e51d1d1d4b52bfe450294d5275fce77312b91e15 by Sergey Poznyakoff

Oops, removed stray conflict indicator

1 parent 778e8041
......@@ -67,7 +67,6 @@
* messages/messages.c (messages_count): Argument should
be const.
>>>>>>> 1.322
2001-11-01 Sergey Poznyakoff
* configure.in: Added check for utmp.h & utmpx.h
......