Fixing the .gitlab-ci.yml file.
The previous merge didn't actually succeed. This fixes it.
We may need to figure out how to handle when the merge fails. So it doesn't actually do the merge.
Signed-off-by: Cliff Hill chill@contractor.usgs.gov
Notice: code.usgs.gov has been migrated to a new server, resulting in a changed SSH host key. If you use SSH, please remove the old entry from your known_hosts file (located at [user]/.ssh/known_hosts) using the command "ssh-keygen -R code.usgs.gov", then reconnect via SSH. Accept the new host key when prompted.
The previous merge didn't actually succeed. This fixes it.
We may need to figure out how to handle when the merge fails. So it doesn't actually do the merge.
Signed-off-by: Cliff Hill chill@contractor.usgs.gov