diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-16 15:25:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-16 15:25:40 +0100 |
| commit | f8f12a1b613a917bd32dc6da940e986ae148713a (patch) | |
| tree | c39c1b8f7e01bb9beda34c261ad38cbbf17ef29a /otp_build | |
| parent | 0f4e3485cbc48fc3e7bba3370b4e42baf2ebd7cb (diff) | |
| parent | 0fb3a5dc1ae3709518d2775671cb6b0a24739e6f (diff) | |
| download | otp-f8f12a1b613a917bd32dc6da940e986ae148713a.tar.gz otp-f8f12a1b613a917bd32dc6da940e986ae148713a.tar.bz2 otp-f8f12a1b613a917bd32dc6da940e986ae148713a.zip | |
Merge branch 'ingela/master/correct-merge-conflict-resolution'
* ingela/master/correct-merge-conflict-resolution:
ssl: Resolve merge conflict resolution error
Diffstat (limited to 'otp_build')
0 files changed, 0 insertions, 0 deletions