summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-04-12 08:26:31 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-04-12 08:26:31 +0200
commit9c0dc2abe07c53802eb1afbc287dfea8fb74fa7d (patch)
tree3905a3702f96087723da1d1f99bcad71f6d239d1 /config
parentfaf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff)
fix stupid merge errors, mentioned by phil
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions