summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remote/rootfs/rootfs-stage32/rootfs-stage32.conf5
1 files changed, 1 insertions, 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