summaryrefslogtreecommitdiff
path: root/package/moc/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-04 13:53:08 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-04 13:53:08 +0100
commit8b3dac771af71587d791d7a8171c2b4036afea10 (patch)
tree644c0eebc8cc73d56bfef111d711b4b0028ad97a /package/moc/Makefile
parent22e24d73762b2cfc79797f94d9e2d9e3f070c418 (diff)
resolve merge conflict, second try
Diffstat (limited to 'package/moc/Makefile')
0 files changed, 0 insertions, 0 deletions