upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
comment and thus compiled.

Submitted by:	bde
This commit is contained in:
David E. O'Brien 2003-08-25 09:28:54 +00:00
parent 9f06a4277f
commit 507dde8b32
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/buslogic/bt.c
View file

@ -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>