You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dy...@apache.org on 2022/05/18 10:35:43 UTC

[incubator-datalab] 04/09: resolve conflict

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

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

commit e6a9f09a41ae1a5847e7b9d9b642041404946af6
Merge: ac1a9a61d a29aa0622
Author: Denys Yankiv <de...@gmail.com>
AuthorDate: Thu May 12 13:54:13 2022 +0300

    resolve conflict

 .../management-grid/management-grid.component.html |  4 ++--
 .../management-grid/management-grid.component.ts   |  5 +++-
 .../administration/management/management.model.ts  |  2 +-
 .../convert-action-type.pipe.ts                    | 28 ++++++++++++----------
 4 files changed, 23 insertions(+), 16 deletions(-)


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