morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

handle merge conflicts after plando update

Browse Source
This commit is contained in:
Fabian Dill
2021-01-17 06:54:38 +01:00
parent 514cd19367
commit 7333a15f1f
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fill.py
View File

@@ -2,8 +2,8 @@ import logging
import typing
from BaseClasses import CollectionState, PlandoItem
from Items import ItemFactory
from Regions import key_drop_data
from worlds.alttp.Items import ItemFactory
from worlds.alttp.Regions import key_drop_data
class FillError(RuntimeError):