diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-30 16:47:45 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-30 16:47:45 +0100 |
| commit | 4bdb1e33a8eb620f53420219d439421da135262f (patch) | |
| tree | 433a090e3899a5dfffae8f8090747dcefa93ff46 /src | |
| parent | bff5d58fcce0534cf4774df386ff448261b28c20 (diff) | |
Increase merge timeouts.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions