diff options
| author | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2014-01-28 15:35:31 +0100 |
| commit | 9c9ba8954358f791a818b3eefda2c0eb805bbd97 (patch) | |
| tree | 0153350406bf1c9c6aafa8e5da5d4b3feb9cd0c9 /.travis.yml | |
| parent | 1b0d40959f529b67db3b9d10dbf93101e0c65c7c (diff) | |
| parent | 19de646f60d4fb52ddd26d25e06f50f8717fd988 (diff) | |
resolv conflict in mira
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions