fix conflicts from 993

This commit is contained in:
alwaysintreble
2023-10-10 18:04:31 -05:00
parent 6f9cbe7750
commit 7bc7465ea5
8 changed files with 14 additions and 11 deletions

View File

@@ -1,7 +1,8 @@
import typing
from BaseClasses import MultiWorld
from Options import Choice, DeathLink, DefaultOnToggle, ItemsAccessibility, Option, PlandoBosses, Range, Toggle
from Options import Choice, DeathLink, DefaultOnToggle, ItemsAccessibility, Option, PlandoBosses, Range, \
StartInventoryPool, Toggle
class Logic(Choice):