diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/x86/sys-available/ibm-x40 | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/sys-available/ibm-x40')
| -rw-r--r-- | target/x86/sys-available/ibm-x40 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 9979295ae..4a2d99258 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -26,3 +26,4 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_PACKAGE_GRUB help System profile for IBM X40 laptop. + |