diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/proftpd/files/proftpd.conffiles | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'package/proftpd/files/proftpd.conffiles')
| -rw-r--r-- | package/proftpd/files/proftpd.conffiles | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/proftpd/files/proftpd.conffiles b/package/proftpd/files/proftpd.conffiles index 9796c366f..3ff0fb2e3 100644 --- a/package/proftpd/files/proftpd.conffiles +++ b/package/proftpd/files/proftpd.conffiles @@ -1 +1,2 @@ /etc/proftpd.conf +/etc/ftpusers |