Resolve conflicts

This commit is contained in:
Afri Schoedon 2018-02-13 16:20:01 +01:00 committed by 5chdn
parent 8c4686482f
commit 6ef563561f
No known key found for this signature in database
GPG Key ID: 1A40871B597F5F80

View File

@ -172,7 +172,7 @@ windows:
- tags - tags
- triggers - triggers
script: script:
- sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" "" windows - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc installer "" "" windows
tags: tags:
- rust-windows - rust-windows
artifacts: artifacts: