Document conflict

This commit is contained in:
espie 2001-10-11 19:25:21 +00:00
parent a8a264afd9
commit aac572d369
2 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.10 2001/05/12 16:41:10 naddy Exp $
@comment $OpenBSD: PLIST,v 1.11 2001/10/11 19:25:21 espie Exp $
@pkgcfl amanda-client-*
libexec/amanda/amandad
libexec/amanda/amcat.awk
libexec/amanda/amcleanupdisk

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-client,v 1.1 2001/05/12 16:41:10 naddy Exp $
@comment $OpenBSD: PLIST-client,v 1.2 2001/10/11 19:25:21 espie Exp $
@pkgcfl amanda-*
libexec/amanda/amandad
libexec/amanda/calcsize
libexec/amanda/killpgrp