diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:40:13 +0100 |
| commit | 2b38e5af3eb58c27cc646fed11ac1a24805fa05d (patch) | |
| tree | 780bd8869c0ed798d8c0abce17869a29cc01fb01 /target/x86/files | |
| parent | 2a2320b4292d4e370cc95aea61525ebd7dc11337 (diff) | |
| parent | 34592482701199604242848b80c39bd07b6c7716 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/files')
| -rw-r--r-- | target/x86/files/etc/network/interfaces | 5 | ||||
| -rw-r--r-- | target/x86/files/etc/tmpfs | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/target/x86/files/etc/network/interfaces b/target/x86/files/etc/network/interfaces deleted file mode 100644 index 104c1a1b6..000000000 --- a/target/x86/files/etc/network/interfaces +++ /dev/null @@ -1,5 +0,0 @@ -auto lo -iface lo inet loopback - -auto eth0 -iface eth0 inet dhcp diff --git a/target/x86/files/etc/tmpfs b/target/x86/files/etc/tmpfs deleted file mode 100644 index 08558e471..000000000 --- a/target/x86/files/etc/tmpfs +++ /dev/null @@ -1 +0,0 @@ -16384 |