summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-07-21 19:20:22 -0700
committerkonstantin@mysql.com <>2004-07-21 19:20:22 -0700
commitcd5359ceda4b4ffada69b824227b9b1519672b9d (patch)
tree0eb3e75bba13be8eb5fb798b586ce570d73221d9 /acinclude.m4
parentd2c1f3fc379d11ec236cb786726be4ba647b3b6f (diff)
downloadmariadb-git-cd5359ceda4b4ffada69b824227b9b1519672b9d.tar.gz
a line left from manual merge removed
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m41
1 files changed, 0 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 5e642c547c3..92a9d9e00b3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1480,7 +1480,6 @@ dnl END OF MYSQL_CHECK_NDBCLUSTER SECTION
dnl ---------------------------------------------------------------------------
->>>>>>>
dnl By default, many hosts won't let programs access large files;
dnl one must use special compiler options to get large-file access to work.
dnl For more details about this brain damage please see: