summaryrefslogtreecommitdiffstats
path: root/lib/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/command.c')
-rw-r--r--lib/command.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/command.c b/lib/command.c
index 4887f94f..0ca86dd3 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -1,5 +1,9 @@
/*
+<<<<<<< HEAD:lib/command.c
+ $Id: command.c,v 1.55 2007/04/28 22:14:10 ajs Exp $
+=======
$Id$
+>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/command.c
Command interpreter routine for virtual terminal [aka TeletYpe]
Copyright (C) 1997, 98, 99 Kunihiro Ishiguro