diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:59:17 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 17:59:17 -0400 |
| commit | c5625f988a37b6876c4ef5fc8d9de295ee28ed44 (patch) | |
| tree | 0c485cce575cee047f61fe274aad44763694dc94 /circle.yml | |
| parent | e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b (diff) | |
| download | qtlocation-mapboxgl-c5625f988a37b6876c4ef5fc8d9de295ee28ed44.tar.gz | |
[ios, android] Resolve merge conflicts.
Diffstat (limited to 'circle.yml')
| -rw-r--r-- | circle.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml index 5f06791cd6..1aacf1a2a6 100644 --- a/circle.yml +++ b/circle.yml @@ -422,7 +422,7 @@ jobs: - deploy: name: Publish to Maven command: | - if [ "${CIRCLE_BRANCH}" == "release-boba" ]; then make run-android-upload-archives ; fi + if [ "${CIRCLE_BRANCH}" == "master" ]; then make run-android-upload-archives ; fi # ------------------------------------------------------------------------------ |