diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-12 15:25:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:45:18 +0200 |
| commit | 8ef3a1254c0be613a7e44e7ebf99f1d6e679b48b (patch) | |
| tree | b778fec35564689f79f7a96ce35444a9f57f0064 /package/dnsmasq/files/dnsmasq.conf | |
| parent | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (diff) | |
resolve merge
Diffstat (limited to 'package/dnsmasq/files/dnsmasq.conf')
0 files changed, 0 insertions, 0 deletions