Resolve conflicts.

* rev. 1.22
This commit is contained in:
Martin Blapp 2003-09-02 11:10:29 +00:00
parent 09f775bd13
commit c262a571d1
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=119673

View File

@ -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$