From 507dde8b3206a74c667efa57a6c2f98a6b9dc2f7 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 25 Aug 2003 09:28:54 +0000
Subject: [PATCH] Remove merge conflict that I didn't notice as it was in the
 middle of a comment and thus compiled.

Submitted by:	bde
---
 sys/dev/buslogic/bt.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 2283b68a547..4920cdb351d 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -29,11 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
-<<<<<<< bt.c
-=======
- * $FreeBSD$
->>>>>>> 1.41
  */
 
 #include <sys/cdefs.h>