Skip to content

Commit 1caff0d

Browse files
committed
Fix conflicts artefacts
1 parent 7734277 commit 1caff0d

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

node_cli/operations/base.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
sync_skale_node,
5555
update_images,
5656
)
57-
from node_cli.operations.docker_lvmpy import lvmpy_install
5857
from node_cli.operations.volume import (
5958
cleanup_volume_artifacts,
6059
ensure_filestorage_mapping,
@@ -66,13 +65,8 @@
6665
docker_cleanup,
6766
remove_dynamic_containers,
6867
)
69-
<<<<<<< Updated upstream
70-
from node_cli.utils.helper import str_to_bool, rm_dir
71-
from node_cli.utils.meta import get_meta_info, update_meta
72-
=======
7368
from node_cli.utils.helper import rm_dir, str_to_bool
74-
from node_cli.utils.meta import CliMetaManager, MirageCliMetaManager
75-
>>>>>>> Stashed changes
69+
from node_cli.utils.meta import get_meta_info, update_meta
7670
from node_cli.utils.node_type import NodeType
7771
from node_cli.utils.print_formatters import print_failed_requirements_checks
7872

0 commit comments

Comments
 (0)