svn commit: r293205 - projects/release-pkg/contrib/ntp/ntpd

[Glen Barber]

Author: gjb
Date: Tue Jan  5 16:23:43 2016
New Revision: 293205
URL: https://svnweb.freebsd.org/changeset/base/293205

Log:
  Fix another mis-merge.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/contrib/ntp/ntpd/ntp_control.c

Modified: projects/release-pkg/contrib/ntp/ntpd/ntp_control.c
==============================================================================
--- projects/release-pkg/contrib/ntp/ntpd/ntp_control.c	Tue Jan  5 16:21:20 2016	(r293204)
+++ projects/release-pkg/contrib/ntp/ntpd/ntp_control.c	Tue Jan  5 16:23:43 2016	(r293205)
@@ -8,7 +8,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif