From owner-svn-src-all@freebsd.org  Sat Apr  1 21:54:00 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C8CED28C33;
 Sat,  1 Apr 2017 21:54:00 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20F95160;
 Sat,  1 Apr 2017 21:54:00 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v31LrxIb098821;
 Sat, 1 Apr 2017 21:53:59 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v31Lrxch098820;
 Sat, 1 Apr 2017 21:53:59 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201704012153.v31Lrxch098820@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Sat, 1 Apr 2017 21:53:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r316375 - stable/11/usr.sbin/fstyp
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Apr 2017 21:54:00 -0000

Author: asomers
Date: Sat Apr  1 21:53:58 2017
New Revision: 316375
URL: https://svnweb.freebsd.org/changeset/base/316375

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

Modified:
  stable/11/usr.sbin/fstyp/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/fstyp/Makefile
==============================================================================
--- stable/11/usr.sbin/fstyp/Makefile	Sat Apr  1 21:51:34 2017	(r316374)
+++ stable/11/usr.sbin/fstyp/Makefile	Sat Apr  1 21:53:58 2017	(r316375)
@@ -13,7 +13,6 @@ MAN=	fstyp.8
 
 WARNS?=	2
 
-.include <src.opts.mk>
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests