diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-01 00:53:09 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-01 00:53:09 -0400 |
| commit | 162826625ae542b4d87b380f093b8f955044dd59 (patch) | |
| tree | 04b7be6e117e8f37d60d15e6e4d41f7d3001d7a7 /preprocessor.py | |
| parent | ad3293595d239ddfc22784d937de7f025999f859 (diff) | |
| parent | 7872b7e8b3b8774ac6c2800c47cc3cfb384f1f57 (diff) | |
Merge branch 'master' into script-commands
Diffstat (limited to 'preprocessor.py')
| -rw-r--r-- | preprocessor.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/preprocessor.py b/preprocessor.py index 54fc4cbff..5c71fe226 100644 --- a/preprocessor.py +++ b/preprocessor.py @@ -3,7 +3,7 @@ import sys -import extras.pokemontools.config as conf +import extras.pokemontools.configuration as configuration import extras.pokemontools.preprocessor as preprocessor from extras.pokemontools.crystal import ( @@ -50,7 +50,7 @@ def preprocess(config, macros, lines=None): return processor.preprocess(lines=lines) def main(): - config = conf.Config() + config = configuration.Config() macros = load_pokecrystal_macros() return preprocess(config, macros) |