diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
| commit | fd88ee34fa5f069412ec9572407babafb74d6554 (patch) | |
| tree | 764dffa7a25d192f368fb48eb5606d85d35a0e79 /scripts/patch.sh | |
| parent | e7fbbc95bc3a73e938d7c0159978a73ee7c3d22a (diff) | |
| parent | 1a3b09a9daae7dc8e116900f2a45a5d6f0bd12f0 (diff) | |
resolve merge conflict
Diffstat (limited to 'scripts/patch.sh')
0 files changed, 0 insertions, 0 deletions