Remove merge conflict that I didn't notice as it was in the middle of a

comment and thus compiled. Submitted by: bde
2003-08-25 09:28:54 +00:00 · 2003-08-25 09:28:54 +00:00 · 507dde8b32
commit 507dde8b32
parent 9f06a4277f
1 changed files with 0 additions and 5 deletions
--- 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>