projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
180d06f
)
Resolved conflicts.
author
Sebastian Hammer
<quinn@indexdata.com>
Tue, 8 Oct 1996 10:44:57 +0000
(10:44 +0000)
committer
Sebastian Hammer
<quinn@indexdata.com>
Tue, 8 Oct 1996 10:44:57 +0000
(10:44 +0000)
client/client.c
patch
|
blob
|
history
diff --git
a/client/client.c
b/client/client.c
index
943fd7b
..
248115a
100644
(file)
--- a/
client/client.c
+++ b/
client/client.c
@@
-4,7
+4,10
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: client.c,v $
- * Revision 1.41 1996-10-07 15:29:03 quinn
+ * Revision 1.42 1996-10-08 10:44:57 quinn
+ * Resolved conflicts.
+ *
+ * Revision 1.41 1996/10/07 15:29:03 quinn
* Work
*
* Revision 1.40 1996/08/29 14:19:34 quinn
* Work
*
* Revision 1.40 1996/08/29 14:19:34 quinn
@@
-1000,17
+1003,6
@@
int cmd_format(char *arg)
recordsyntax = VAL_DANMARC;
return 1;
}
recordsyntax = VAL_DANMARC;
return 1;
}
-<<<<<<< client.c
- else if (!strcmp(arg, "grs1"))
- {
- printf("Preferred format is GRS1\n");
- recordsyntax = VAL_GRS1;
- return 1;
- }
- else if (!strcmp(arg, "soif"))
-||||||| 1.40
- else if (!strcmp(arg, "grs1"))
-=======
else if (!strcmp(arg, "ukmarc"))
{
printf("Preferred format is UKMARC\n");
else if (!strcmp(arg, "ukmarc"))
{
printf("Preferred format is UKMARC\n");
@@
-1018,7
+1010,12
@@
int cmd_format(char *arg)
return 1;
}
else if (!strcmp(arg, "grs1"))
return 1;
}
else if (!strcmp(arg, "grs1"))
->>>>>>> /tmp/T4a00171
+ {
+ printf("Preferred format is GRS1\n");
+ recordsyntax = VAL_GRS1;
+ return 1;
+ }
+ else if (!strcmp(arg, "soif"))
{
printf("Preferred format is SOIF\n");
recordsyntax = VAL_SOIF;
{
printf("Preferred format is SOIF\n");
recordsyntax = VAL_SOIF;