diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2016-11-03 18:16:02 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 18:16:02 -0200 |
| commit | bfab09559cdbbc7e163490129ac7d3c4060b905d (patch) | |
| tree | b2cb4e9eda30c0ccabad972393dd4435e6ed9573 /.busted | |
| parent | 9822682e68b252b049e2fa6ef9d052d7ac739378 (diff) | |
| parent | cee2d3abfc1c06f382787d7bf7d2110a52ca0e76 (diff) | |
| download | luarocks-bfab09559cdbbc7e163490129ac7d3c4060b905d.tar.gz luarocks-bfab09559cdbbc7e163490129ac7d3c4060b905d.tar.bz2 luarocks-bfab09559cdbbc7e163490129ac7d3c4060b905d.zip | |
Merge pull request #644 from mpeterv/fix-conflict-resolve
Fix conflict resolution on deploy/remove w.r.t. C/Lua modules with same name
Diffstat (limited to '.busted')
0 files changed, 0 insertions, 0 deletions