Oops, removed stray conflict indicator
Showing
1 changed file
with
0 additions
and
1 deletions
... | @@ -67,7 +67,6 @@ | ... | @@ -67,7 +67,6 @@ |
67 | * messages/messages.c (messages_count): Argument should | 67 | * messages/messages.c (messages_count): Argument should |
68 | be const. | 68 | be const. |
69 | 69 | ||
70 | >>>>>>> 1.322 | ||
71 | 2001-11-01 Sergey Poznyakoff | 70 | 2001-11-01 Sergey Poznyakoff |
72 | 71 | ||
73 | * configure.in: Added check for utmp.h & utmpx.h | 72 | * configure.in: Added check for utmp.h & utmpx.h | ... | ... |
-
Please register or sign in to post a comment