diff options
| author | obrien <obrien@FreeBSD.org> | 2003-08-25 09:28:54 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-08-25 09:28:54 +0000 |
| commit | 492dab9e35d893eebe141c23e1178958b2676b31 (patch) | |
| tree | e93e49029db648e48ace63085abc45e88ff0eac5 /sys/dev/buslogic | |
| parent | 1c87c82d4e340c457c3249682fabf707e7caf3c9 (diff) | |
| download | FreeBSD-src-492dab9e35d893eebe141c23e1178958b2676b31.zip FreeBSD-src-492dab9e35d893eebe141c23e1178958b2676b31.tar.gz | |
Remove merge conflict that I didn't notice as it was in the middle of a
comment and thus compiled.
Submitted by: bde
Diffstat (limited to 'sys/dev/buslogic')
| -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> |
