From 17a0b22e83b9ec4912161382b78c20fcb2ab97a3 Mon Sep 17 00:00:00 2001
From: Mike Bordua <core-talk@aps.anl.gov>
Date: Tue, 12 Jul 1994 20:32:04 +0000
Subject: [PATCH] Fixed collision.

---
 src/drv/drvEpvxi.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/drv/drvEpvxi.c b/src/drv/drvEpvxi.c
index ab7ff1d8f..ed7c8d100 100644
--- a/src/drv/drvEpvxi.c
+++ b/src/drv/drvEpvxi.c
@@ -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>