From 43468a04d863bc95d8b3a999f764488ba6039cfc Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 25 Jun 1997 06:32:20 +0000
Subject: [PATCH] removed merge marks

---
 config/CONFIG.pc486 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/CONFIG.pc486 b/config/CONFIG.pc486
index bb69b281c..5bfe523cc 100644
--- a/config/CONFIG.pc486
+++ b/config/CONFIG.pc486
@@ -1,10 +1,9 @@
-<<<<<<< CONFIG.pc486
+
 #
 # no longer required
 #
 #SHELL=knts
-=======
->>>>>>> 1.3
+
 
 # BUILD_TYPE
 #   Currently either Vx or Unix