diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:57:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:57:50 +0200 |
| commit | faf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (patch) | |
| tree | 1652e4bf6d5d999b3e565b32d2e8c862efa7fc9b /package/base-files/files/base-files.conffiles | |
| parent | 7c46b5169bb606c3449cbb64f835589161f01166 (diff) | |
| parent | 9cfdb6d7a7e939427b7b6e41e1f2074eff724457 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/Config.in
Diffstat (limited to 'package/base-files/files/base-files.conffiles')
| -rw-r--r-- | package/base-files/files/base-files.conffiles | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/package/base-files/files/base-files.conffiles b/package/base-files/files/base-files.conffiles index 2495e2ee4..b2f9597a8 100644 --- a/package/base-files/files/base-files.conffiles +++ b/package/base-files/files/base-files.conffiles @@ -7,7 +7,6 @@ /etc/profile /etc/protocols /etc/sysctl.conf -/etc/network/interfaces /etc/rc.conf /etc/sysctl.conf /etc/shadow |