diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /target/config/Config.in.tools | |
parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) |
resolve merge conflict
Diffstat (limited to 'target/config/Config.in.tools')
-rw-r--r-- | target/config/Config.in.tools | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index cf92eadee..d863179b8 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -6,10 +6,6 @@ config ADK_HOST_NEED_SYSLINUX boolean default n -config ADK_HOST_NEED_GPERF - boolean - default n - config ADK_HOST_NEED_SQUASHFS boolean default n |