From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 Config.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Config.in')

diff --git a/Config.in b/Config.in
index c42dfbf10..101111940 100644
--- a/Config.in
+++ b/Config.in
@@ -61,6 +61,10 @@ endmenu
 menu "Package selection"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 
+source "package/Config.in.auto.global"
+source "package/Config.in"
+
+menu "Package options"
 config ADK_LEAVE_ETC_ALONE
 	boolean "do not install anything into /etc"
 	default n
@@ -101,8 +105,7 @@ config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS
 	  Note that without further customisation, turning this option
 	  off will almost certainly render the resulting system unusable.
 
-source "package/Config.in.auto.global"
-source "package/Config.in.auto"
+endmenu
 endmenu
 
 menu "Runtime configuration"
-- 
cgit v1.2.3