diff options
| author | Zach LeBar <zach@zachlebar.com> | 2012-08-20 19:01:17 +0000 |
|---|---|---|
| committer | Zach LeBar <zach@zachlebar.com> | 2012-08-20 19:01:17 +0000 |
| commit | 14dc8e248b951add40c6f4715715a7ed0b2c67bc (patch) | |
| tree | cbee837e9c7bb4eb67e1e131032c376d7bfc9a07 /kamailio.roles | |
| parent | 59d8caa19b5f261006f4e5922aae43976dd415b5 (diff) | |
| download | acf-kamailio-14dc8e248b951add40c6f4715715a7ed0b2c67bc.tar.bz2 acf-kamailio-14dc8e248b951add40c6f4715715a7ed0b2c67bc.tar.xz | |
Fixed merge conflict in 'kamailio-model.lua'.
Diffstat (limited to 'kamailio.roles')
0 files changed, 0 insertions, 0 deletions