diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2013-10-02 13:34:59 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2013-10-02 13:34:59 +0200 |
| commit | 18908589a096719eb4ce76123596865093d6ff9d (patch) | |
| tree | f99847dd5ebc3d142248ec77d36d4516978bebfd /test/integration/test-implicit-conflicts-real-not-virtual | |
| parent | 8fa042ca39dcb39d544f015f4a924c5dbc10ad2c (diff) | |
tests: fix some problems travis encounters
Git-Dch: Ignore
Diffstat (limited to 'test/integration/test-implicit-conflicts-real-not-virtual')
0 files changed, 0 insertions, 0 deletions