Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Mar 2017 16:22:21 +0000 (UTC)
From:      Alan Somers <asomers@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r314963 - head/usr.sbin/fstyp
Message-ID:  <201703091622.v29GMLYr038493@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: asomers
Date: Thu Mar  9 16:22:21 2017
New Revision: 314963
URL: https://svnweb.freebsd.org/changeset/base/314963

Log:
  Fix harmless mismerge from r286964
  
  MFC after:	3 days
  Sponsored by:	Spectra Logic Corp

Modified:
  head/usr.sbin/fstyp/Makefile

Modified: head/usr.sbin/fstyp/Makefile
==============================================================================
--- head/usr.sbin/fstyp/Makefile	Thu Mar  9 15:44:25 2017	(r314962)
+++ head/usr.sbin/fstyp/Makefile	Thu Mar  9 16:22:21 2017	(r314963)
@@ -13,7 +13,6 @@ MAN=	fstyp.8
 
 WARNS?=	2
 
-.include <src.opts.mk>
 .include <bsd.endian.mk>
 
 .if ${MK_TESTS} != "no" && ${TARGET_ENDIANNESS} == 1234



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703091622.v29GMLYr038493>