diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/base-files/files/base-files.conffiles | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
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 |