diff options
author | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-03-06 11:49:39 +0100 |
---|---|---|
committer | Kristofer Pettersson <kristofer.pettersson@sun.com> | 2009-03-06 11:49:39 +0100 |
commit | 55c779cdbf0e402338bb32253a2fc1db7fa02129 (patch) | |
tree | a2136f93bb28c0e655cf133c9245ead5bf039ae9 /cmd-line-utils/libedit/compat_conf.h | |
parent | ac821c65701d38ced2d3167cf9c54559599d4f52 (diff) | |
parent | b4fdb8aec14b533db4a5ea2f99c1a9f3ce07946c (diff) | |
download | mariadb-git-55c779cdbf0e402338bb32253a2fc1db7fa02129.tar.gz |
Manual merge
Diffstat (limited to 'cmd-line-utils/libedit/compat_conf.h')
-rw-r--r-- | cmd-line-utils/libedit/compat_conf.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd-line-utils/libedit/compat_conf.h b/cmd-line-utils/libedit/compat_conf.h deleted file mode 100644 index e2b9557f5b1..00000000000 --- a/cmd-line-utils/libedit/compat_conf.h +++ /dev/null @@ -1,2 +0,0 @@ - -#include "my_config.h" |