]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
projects / packages / o / openafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 20bc57c)
STABLE14-windows-version-20050902
authorJeffrey Altman <jaltman@secure-endpoints.com>
Fri, 2 Sep 2005 18:37:08 +0000 (18:37 +0000)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Fri, 2 Sep 2005 18:37:08 +0000 (18:37 +0000)
fix typo in version 1.4.0002 declaration

src/config/NTMakefile.i386_w2k patch | blob | history

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 2972f8301f72ca48c0105fe3281308d0a44bcb42..171711ab03fa8de31c2807aab3cdf4c3b305fc4e 100644 (file)
--- 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