From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 2 Sep 2005 18:37:08 +0000 (+0000)
Subject: STABLE14-windows-version-20050902
X-Git-Tag: openafs-stable-1_4_0-rc3~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9ec37a60fad20a7f6dda8fc040b36e4f70b2bf31;p=packages%2Fo%2Fopenafs.git

STABLE14-windows-version-20050902


fix typo in version 1.4.0002 declaration
---

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