From 1df71a7fa071e0fac40b305dcc36912df166c073 Mon Sep 17 00:00:00 2001
From: Brian Harring <ferringb@gentoo.org>
Date: Tue, 30 Aug 2005 05:16:47 +0000
Subject: header changes, $Header: -> $Id:

svn path=/main/branches/2.0/; revision=1951
---
 bin/pkgmerge | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/pkgmerge')

diff --git a/bin/pkgmerge b/bin/pkgmerge
index 2bbb5f680..2cf9b5d35 100755
--- a/bin/pkgmerge
+++ b/bin/pkgmerge
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.8 2004/10/04 13:56:50 vapier Exp $
+# $Id: /var/cvsroot/gentoo-src/portage/bin/pkgmerge,v 1.8 2004/10/04 13:56:50 vapier Exp $
 
 import sys,os,string
 sys.path = ["/usr/lib/portage/pym"]+sys.path
-- 
cgit v1.2.3-1-g7c22