Merge branch 'freebsd/11-stable/master' into hardened/11-stable/master

* freebsd/11-stable/master: Fix fallout from applying a patch twice.
HardenedBSD · Jan 13, 2018 · 7e7e65d · 7e7e65d
2 parents 9bb480f + 7f8a524
commit 7e7e65d
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/tools/build/options/WITHOUT_LINT b/tools/build/options/WITHOUT_LINT
@@ -1,4 +1,2 @@
 .\" $FreeBSD$
 Set to not build the lint binaries and library.
-.\" $FreeBSD$
-Set to not build the lint binaries and library.