From f3485df8704f084e4a8babb21129650ee12d06a4 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 3 May 2013 15:26:25 +0200
Subject: oops

---
 data/kernel.wanted.config | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/kernel.wanted.config b/data/kernel.wanted.config
index a2e646a1..05eb508a 100644
--- a/data/kernel.wanted.config
+++ b/data/kernel.wanted.config
@@ -92,7 +92,6 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXYNOS_VIDEO=y
-<<<<<<< HEAD
 #CONFIG_FB_3DFX_ACCEL=y
 #CONFIG_FB_3DFX_I2C=y
 #CONFIG_FB_3DFX=y
@@ -168,8 +167,6 @@ CONFIG_FB_VESA=y
 #CONFIG_FB_VIA=y
 #CONFIG_FB_VOODOO1=y
 #CONFIG_FB_VT8623=y
-=======
->>>>>>> 50e92b9f7e911d327b9d5d271e40b519ed6eb47c
 CONFIG_FEALNX=y
 CONFIG_FORCEDETH=y
 CONFIG_GENERIC_GPIO=y
-- 
cgit v1.2.3-55-g7522