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.hardware | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware
index d522ec56c..9bdfac2fd 100644
--- a/target/config/Config.in.hardware
+++ b/target/config/Config.in.hardware
@@ -1,3 +1,6 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
 # hardware features, do not use for qemu
 config ADK_TARGET_WITH_CPU_FREQ
 	boolean
-- 
cgit v1.2.3