diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-11-17 17:35:55 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-11-17 17:35:55 -0600 |
| commit | 96088a6266cf64766f576c404728af63d02b71c2 (patch) | |
| tree | a3f70e73af87597d3e494f521eff30a9a9dd0475 | |
| parent | 7e9e9cf1e566fd99c151af0b025462cdd5392a10 (diff) | |
| parent | 3027746bd69db504f8d0e311d9f81593337ff236 (diff) | |
Merge branch 'master' into path-finding
| -rw-r--r-- | pokemontools/map_editor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pokemontools/map_editor.py b/pokemontools/map_editor.py index 4c0bec5..566d422 100644 --- a/pokemontools/map_editor.py +++ b/pokemontools/map_editor.py @@ -6,8 +6,8 @@ from ttk import Frame, Style import PIL from PIL import Image, ImageTk -import config -conf = config.Config() +import configuration +conf = configuration.Config() #version = 'crystal' |