diff options
-rw-r--r-- | sys/dev/buslogic/bt.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c index 2283b68..4920cdb 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> |