summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-21 08:34:35 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-21 08:34:35 +0100
commitfd88ee34fa5f069412ec9572407babafb74d6554 (patch)
tree764dffa7a25d192f368fb48eb5606d85d35a0e79 /target
parente7fbbc95bc3a73e938d7c0159978a73ee7c3d22a (diff)
parent1a3b09a9daae7dc8e116900f2a45a5d6f0bd12f0 (diff)
resolve merge conflict
Diffstat (limited to 'target')
0 files changed, 0 insertions, 0 deletions