summaryrefslogtreecommitdiffstats
path: root/contrib/amd/fixmount/fixmount.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1998-11-14 03:13:33 +0000
committerobrien <obrien@FreeBSD.org>1998-11-14 03:13:33 +0000
commitf3f64ef024d63360298245ec26ebf66eb395bd71 (patch)
treed7c98193482b80a21d31de21be70e8f70eb820f1 /contrib/amd/fixmount/fixmount.c
parentd9a3e6b7f346909cb3bf355119d588c1c35beb53 (diff)
downloadFreeBSD-src-f3f64ef024d63360298245ec26ebf66eb395bd71.zip
FreeBSD-src-f3f64ef024d63360298245ec26ebf66eb395bd71.tar.gz
Clean up conflicts.
Diffstat (limited to 'contrib/amd/fixmount/fixmount.c')
-rw-r--r--contrib/amd/fixmount/fixmount.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c
index 53c7807..0741cb8 100644
--- a/contrib/amd/fixmount/fixmount.c
+++ b/contrib/amd/fixmount/fixmount.c
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: fixmount.c,v 1.1.1.1 1998/08/23 22:07:20 obrien Exp $
+ * $Id: fixmount.c,v 1.2 1998/08/23 22:52:08 obrien Exp $
*
*/
@@ -354,7 +354,7 @@ main(int argc, char *argv[])
perror("gethostname");
exit(1);
}
- thishost[sizeof(thishost) - 1] = '\0';
+ thishost[sizeof(thishost) - 1] = '\0';
/*
* We need the hostname as it appears to the other side's
OpenPOWER on IntegriCloud