Resolve conflicts.
* rev. 1.22
This commit is contained in:
parent
09f775bd13
commit
c262a571d1
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $Id: freebsd,v 1.13.2.4 2002/06/09 22:37:55 murray Exp $
|
||||
# $Id: freebsd,v 1.13.2.5 2003/04/27 19:44:01 dhankins Exp $
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user