Skip to content

Commit

Permalink
fix: fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
BrunoLiegiBastonLiegi committed May 7, 2024
1 parent c708b51 commit ec0c04b
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/qibo_cloud_backends/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit ec0c04b

Please sign in to comment.