diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/asterisk/files/asterisk.conffiles | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/asterisk/files/asterisk.conffiles')
| -rw-r--r-- | package/asterisk/files/asterisk.conffiles | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/package/asterisk/files/asterisk.conffiles b/package/asterisk/files/asterisk.conffiles index 2cb705f9c..55949fde7 100644 --- a/package/asterisk/files/asterisk.conffiles +++ b/package/asterisk/files/asterisk.conffiles @@ -13,7 +13,6 @@ /etc/asterisk/modules.conf /etc/asterisk/musiconhold.conf /etc/asterisk/osp.conf -/etc/asterisk/privacy.conf /etc/asterisk/queues.conf /etc/asterisk/rtp.conf /etc/asterisk/sip.conf |