diff options
author | roy lewin <roy.lewin@gmail.com> | 2016-09-22 01:58:05 +0300 |
---|---|---|
committer | roy lewin <roy.lewin@gmail.com> | 2016-09-22 01:58:05 +0300 |
commit | 733afb1109a06f89af68e8660728f1b4bbbdab1a (patch) | |
tree | ec4c965bea61228c55a7c4c68e1be86446291620 /factories/__init__.py | |
parent | 652781137f3856fef98e3063766f9f3b1a984a2e (diff) | |
parent | 081eac29a20ab8485f2b8180654a6d4b808e2df7 (diff) |
Merge branch 'master' of https://bitbucket.org/lib_2_wiki/parser
# Conflicts:
# .idea/misc.xml
# .idea/workspace.xml
# parsers/INL_xml_parser.py
Diffstat (limited to 'factories/__init__.py')
-rw-r--r-- | factories/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/factories/__init__.py b/factories/__init__.py index add236d..86901f5 100644 --- a/factories/__init__.py +++ b/factories/__init__.py @@ -1,2 +1,2 @@ -from basic_factory import BasicFactory -from INL_factory import INLFactory
\ No newline at end of file +from factories.basic_factory import BasicFactory +from factories.INL_factory import INLFactory
\ No newline at end of file |