[Zope-CVS] CVS: Packages/WinBuilders/mk - zeo.mk:1.4.2.4

[Tim Peters]

Update of /cvs-repository/Packages/WinBuilders/mk
In directory cvs.zope.org:/tmp/cvs-serv14500/mk

Modified Files:
      Tag: tim-zrs-branch
	zeo.mk 
Log Message:
Removed resolved XXX comment; reverted a temp change prior to merge.


=== Packages/WinBuilders/mk/zeo.mk 1.4.2.3 => 1.4.2.4 ===
--- Packages/WinBuilders/mk/zeo.mk:1.4.2.3	Wed Feb  4 21:34:10 2004
+++ Packages/WinBuilders/mk/zeo.mk	Wed Feb  4 22:31:34 2004
@@ -49,9 +49,7 @@
 
 $(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_REPOSITORY=$(ZOPE_CVS_REPOSITORY)
 $(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_MODULE=Zope/lib/python/nt_svcutils
-# XXX Restore the HEAD line before merging branch.
-$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_TAG=-r jeremy-windows-service-branch
-#$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_TAG=-r HEAD
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_TAG=-r HEAD
 
 $(BUILD_DIR)/lib/python/nt_svcutils/__init__.py:
 	${CD} ${BUILD_DIR}/lib/python && \