removed merge marks

1997-06-25 06:32:20 +00:00
parent b67fb3c48a
commit 43468a04d8
1 changed files with 2 additions and 3 deletions
--- 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