Remove forgotten line from previous merge commit

diff --git a/configure.in b/configure.in
index b21493ba142d04c0a4de109c1f373d245b057fe4..20d613ca5f250f7ee47f2901a5a4b1befa1ebe58 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -975,7 +975,6 @@ AC_ARG_ENABLE(overwrite,
 AC_MSG_RESULT([$OVERWRITE_CONFIG])
 
 dnl --------------------- check for ACL support
-<<<<<<< HEAD
 AC_MSG_CHECKING(whether to support ACLs)
 AC_ARG_WITH(acls,
     [AS_HELP_STRING([--with-acls],