diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 16:48:45 +0100 |
| commit | 38136c7702e1940a88f24d09141f07b23b966a1c (patch) | |
| tree | b1ba1e95441ce11b8ed84dc3810c7481df26ef92 /target/config | |
| parent | 50e7ffe10d0bca1ef5b2d27ebc518b456035a18d (diff) | |
| parent | 2dce122bacb8837543ff8e882a1df7284324e357 (diff) | |
resolve conflict
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in.arch | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/target/config/Config.in.arch b/target/config/Config.in.arch deleted file mode 100644 index 592d973f2..000000000 --- a/target/config/Config.in.arch +++ /dev/null @@ -1,3 +0,0 @@ -source "target/config/Config.in.arch.default" -config ADK_LINUX_ARM - bool |