BUGFIX: unwanted conflict

ansys · Oct 23, 2023 · d7d75f4 · d7d75f4
1 parent 273dd05
commit d7d75f4
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/pyedb/generic/design_types.py b/src/pyedb/generic/design_types.py
@@ -99,12 +99,7 @@ def Edb(
             )
     # TODO: Use EDB gRPC
     else:
-<<<<<<< HEAD
-        raise Exception("not implemented yet")
-        from pyedb.edb import Edb as app
-=======
         from pyedb.grpc.edb import Edb as app
->>>>>>> main
         return app(
             edbpath=edbpath,
             cellname=cellname,