summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2003-08-25 09:28:54 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2003-08-25 09:28:54 +0000
commit507dde8b3206a74c667efa57a6c2f98a6b9dc2f7 (patch)
treee93e49029db648e48ace63085abc45e88ff0eac5 /sys/dev
parent9f06a4277f1fe2bf66be975977b6170d40d47b69 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/buslogic/bt.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 2283b68a547c..4920cdb351dc 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>