Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
daler-sz committed Jan 20, 2024
1 parent 1ce09cd commit 6275bad
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/adaptix/_internal/morphing/enum_provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from ..common import Dumper, Loader, TypeHint
from ..morphing.provider_template import DumperProvider, LoaderProvider
from ..provider.essential import CannotProvide, Mediator
from ..provider.essential import Mediator
from ..provider.loc_stack_filtering import DirectMediator, LastLocMapChecker
from ..provider.provider_template import for_predicate
from ..provider.request_cls import LocMap, TypeHintLoc, get_type_from_request
Expand Down

0 comments on commit 6275bad

Please sign in to comment.