From 6c34363f10b6666697c939ad72ac184cb96e34e2 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Wed, 5 Jun 2013 16:06:59 +0200
Subject: merge

---
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 0efbe5e8..c8d47639 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -29,12 +29,9 @@ REQUIRED_BINARIES="
 			bc
 			dirname
 			mkdosfs
-<<<<<<< HEAD
-			amixer"
-=======
+			amixer
 			iptables
 "
->>>>>>> e3ecae28eff31fe097cb479ae981e9739cfb15e9
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
-- 
cgit v1.2.3-55-g7522