summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_merge
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-05-10 09:17:56 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-05-10 09:17:56 +0000
commit598410cb33a5dae4a9cc9ace47b13645dd15de75 (patch)
treefb510b8378c93a84533c15a500e8cc37c66a2fff /usr.sbin/pkg_add/pkg_merge
parent0c6b6c722d524ad6a478fc0d2efc5076a4aca479 (diff)
whitespace fixes
Diffstat (limited to 'usr.sbin/pkg_add/pkg_merge')
-rw-r--r--usr.sbin/pkg_add/pkg_merge6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge
index cf75a12b05b..280df066fdf 100644
--- a/usr.sbin/pkg_add/pkg_merge
+++ b/usr.sbin/pkg_add/pkg_merge
@@ -1,11 +1,11 @@
#! /usr/bin/perl
# Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
-# $OpenBSD: pkg_merge,v 1.13 2009/11/10 11:36:56 espie Exp $
-#
+# $OpenBSD: pkg_merge,v 1.14 2010/05/10 09:17:55 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
# copyright notice and this permission notice appear in all copies.
-#
+#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR