Fixed collision.

1994-07-12 20:32:04 +00:00
parent 203c80f2fe
commit 17a0b22e83
1 changed files with 0 additions and 4 deletions
@@ -138,11 +138,7 @@
 *
 */

-<<<<<<< drvEpvxi.c
-static char *sccsId = "@(#)drvEpvxi.c	1.27\t9/9/93";
-=======
 static char *sccsId = "$Id$\t$Date$";
->>>>>>> 1.28

 #include <vxWorks.h>
 #include <vme.h>