From 9ec37a60fad20a7f6dda8fc040b36e4f70b2bf31 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 2 Sep 2005 18:37:08 +0000
Subject: [PATCH] STABLE14-windows-version-20050902

fix typo in version 1.4.0002 declaration
---
 src/config/NTMakefile.i386_w2k | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 2972f8301..171711ab0 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -78,7 +78,6 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
-<<<<<<< NTMakefile.i386_w2k
 AFSPRODUCT_VER_MINOR=4
 AFSPRODUCT_VER_PATCH=0002
 AFSPRODUCT_VER_BUILD=0
-- 
2.39.5