diff options
| author | Michael Neves | 2013-06-05 16:06:59 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-06-05 16:06:59 +0200 |
| commit | 6c34363f10b6666697c939ad72ac184cb96e34e2 (patch) | |
| tree | d3e30d52e3d76823d818201b9999d95ef4d7e197 /remote/rootfs | |
| parent | host bridge interface (diff) | |
| download | tm-scripts-6c34363f10b6666697c939ad72ac184cb96e34e2.tar.gz tm-scripts-6c34363f10b6666697c939ad72ac184cb96e34e2.tar.xz tm-scripts-6c34363f10b6666697c939ad72ac184cb96e34e2.zip | |
merge
Diffstat (limited to 'remote/rootfs')
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf | 5 |
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 |