summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_merge
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/pkg_add/pkg_merge')
-rw-r--r--usr.sbin/pkg_add/pkg_merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge
index 71b682b79f5..b9ef31b5803 100644
--- a/usr.sbin/pkg_add/pkg_merge
+++ b/usr.sbin/pkg_add/pkg_merge
@@ -1,6 +1,6 @@
#! /usr/bin/perl
# Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
-# $OpenBSD: pkg_merge,v 1.17 2010/06/30 10:41:41 espie Exp $
+# $OpenBSD: pkg_merge,v 1.18 2010/06/30 10:51:04 espie Exp $
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above