From 2735fdf97305e110eba8e776f8728a52ae886c05 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 23 May 2014 16:39:17 +0200
Subject: resolve merge conflict

---
 target/config/Config.in.x86 | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 target/config/Config.in.x86

(limited to 'target/config/Config.in.x86')

diff --git a/target/config/Config.in.x86 b/target/config/Config.in.x86
new file mode 100644
index 000000000..3bbae5db1
--- /dev/null
+++ b/target/config/Config.in.x86
@@ -0,0 +1,5 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+source target/config/Config.in.x86.choice
+source target/config/Config.in.x86.default
-- 
cgit v1.2.3