a line left from manual merge removed

e1170e4c · unknown · cb250499 · e1170e4c
Commit e1170e4c authored Jul 21, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

acinclude.m4 acinclude.m4 +0 -1

No files found.
--- 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: