From bb182c49a5a8b379b8a021eed572d070307333a9 Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Thu, 29 Aug 1996 14:19:34 +0000 Subject: [PATCH] Fixed conflict (CVS) --- client/client.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/client/client.c b/client/client.c index c8a1d73..483b838 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.39 1996-08-27 10:43:22 quinn + * Revision 1.40 1996-08-29 14:19:34 quinn + * Fixed conflict (CVS) + * + * Revision 1.39 1996/08/27 10:43:22 quinn * Made select() optional * * Revision 1.38 1996/08/12 14:09:11 adam @@ -992,6 +995,12 @@ int cmd_format(char *arg) recordsyntax = VAL_DANMARC; return 1; } + else if (!strcmp(arg, "ukmarc")) + { + printf("Preferred format is UKMARC\n"); + recordsyntax = VAL_UKMARC; + return 1; + } else if (!strcmp(arg, "grs1")) { printf("Preferred format is GRS1\n"); @@ -1012,7 +1021,7 @@ int cmd_format(char *arg) } else { - printf("Specify one of {sutrs,usmarc,danmarc,grs1,summary,explain}.\n"); + printf("Specify one of {sutrs,usmarc,danmarc,ukmarc,grs1,summary,explain}.\n"); return 0; } } -- 1.7.10.4