You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@datalab.apache.org by lf...@apache.org on 2020/12/17 14:21:39 UTC

[incubator-datalab] 03/03: [DATALAB-2091]: resolved merge conflict

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit ed816e70b9890c78757f41a2868c7ef261c6a476
Merge: 763ec27 2896c26
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Dec 17 16:21:09 2020 +0200

    [DATALAB-2091]: resolved merge conflict

 infrastructure-provisioning/src/general/files/gcp/base_Dockerfile | 1 +
 1 file changed, 1 insertion(+)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org