merge error

3a56452c · unknown · 8998e128 · 3a56452c
Commit 3a56452c authored Nov 24, 2004 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

client/Makefile.am client/Makefile.am +0 -1

No files found.
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -26,7 +26,6 @@ bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \
 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen
 noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \
 				client_priv.h
-mysqladmin_SOURCES =		mysqladmin.cc
 mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
 mysqladmin_SOURCES =		mysqladmin.cc
 mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)