From 89832d3b32eeb541940161d1b1cfd54742437a5f Mon Sep 17 00:00:00 2001
From: Till Straumann <strauman@slac.stanford.edu>
Date: Thu, 23 Apr 2009 04:57:12 +0000
Subject:  - resolved conflict

---
 bsd_eth_drivers/libbsdport/devicet.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'bsd_eth_drivers')

diff --git a/bsd_eth_drivers/libbsdport/devicet.c b/bsd_eth_drivers/libbsdport/devicet.c
index 45108a2..fde3975 100644
--- a/bsd_eth_drivers/libbsdport/devicet.c
+++ b/bsd_eth_drivers/libbsdport/devicet.c
@@ -12,12 +12,8 @@
 #include <sys/bus.h>
 #include "libbsdport_api.h"
 
-<<<<<<< devicet.c
 #define  DEBUG 0
 int libbsdportAttachVerbose = DEBUG;
-=======
-#undef  DEBUG
->>>>>>> 1.1.1.2
 
 extern void real_libc_free(void*);
 
-- 
cgit v1.2.3