From ec0c04b46967e55f9d4690df51b0dfa617cb589c Mon Sep 17 00:00:00 2001 From: BrunoLiegiBastonLiegi Date: Tue, 7 May 2024 11:13:58 +0200 Subject: [PATCH] fix: fix conflict --- src/qibo_cloud_backends/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/qibo_cloud_backends/__init__.py b/src/qibo_cloud_backends/__init__.py index 0345337..8801dd3 100644 --- a/src/qibo_cloud_backends/__init__.py +++ b/src/qibo_cloud_backends/__init__.py @@ -1,10 +1,5 @@ import importlib.metadata as im import os -<<<<<<< HEAD -from typing import Union - -======= ->>>>>>> f7879de (fix: small fixes) from typing import Union from qibo.config import raise_error