Merge branch 'main' into dev-rmscenario

canonical · Oct 11, 2024 · 298e918 · 298e918
2 parents 1ab1f80 + 2a62dd3
commit 298e918
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/charm.py b/src/charm.py
@@ -32,10 +32,10 @@
     ModelError,
     RelationBrokenEvent,
     WaitingStatus,
+    main,
 )
 from ops.charm import CharmBase
 from ops.framework import EventBase
-from ops.main import main
 from ops.pebble import Layer
 
 logger = logging.getLogger(__name__)