diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/config/Config.in.pm | |
parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.pm')
0 files changed, 0 insertions, 0 deletions