diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:18:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:18:07 +0200 |
| commit | 4882a074aac789c688d8ccc444f7cd57d775fe8a (patch) | |
| tree | 5b88be0fd3b5a3ce3efb6eeed8eb4f7144573a17 /config/zconf.l | |
| parent | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (diff) | |
resolve merge conflict
Diffstat (limited to 'config/zconf.l')
0 files changed, 0 insertions, 0 deletions