diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2016-10-20 01:59:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 01:59:08 -0400 |
| commit | 02dc970620ea88d63093a3f848eac69bb9e3e460 (patch) | |
| tree | 2f2e15f68cb797776430f493e0341fae8d1daa3f /COPYING | |
| parent | 78e84d2c903e85ec620c08275519dac65e9cbf97 (diff) | |
| parent | c7b91ce031a3b7877f59951fc8570c97f598e771 (diff) | |
| download | luarocks-02dc970620ea88d63093a3f848eac69bb9e3e460.tar.gz luarocks-02dc970620ea88d63093a3f848eac69bb9e3e460.tar.bz2 luarocks-02dc970620ea88d63093a3f848eac69bb9e3e460.zip | |
Merge pull request #631 from mpeterv/fix-conflict-resolution
Fix conflict resolution
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions