summaryrefslogtreecommitdiff
path: root/pokemontools/map_editor.py
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-11-18 21:03:31 -0500
committeryenatch <yenatch@gmail.com>2013-11-18 21:03:31 -0500
commitdfc88b9ac0369632bfa93a3859bf26dc2828ae9e (patch)
tree6243ede1e0a5a0bc2a76abf8c5027e21f1a72471 /pokemontools/map_editor.py
parent9d01c85d3bac2a6a7b5826dc2139f69731a901ab (diff)
parent3027746bd69db504f8d0e311d9f81593337ff236 (diff)
Merge branch 'master' of github.com:kanzure/pokemon-reverse-engineering-tools
Diffstat (limited to 'pokemontools/map_editor.py')
-rw-r--r--pokemontools/map_editor.py4
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'