Merge pull request #14 from sergray/master

FIX naming collisions of package, module and decorator
kpn · Jun 29, 2016 · 6114acc · 6114acc
2 parents f08bf6b + 12bb797
commit 6114acc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/time_execution/__init__.py b/time_execution/__init__.py
@@ -1 +1 @@
-from .time_execution import *
+from .decorator import *
diff --git a/time_execution/time_execution.py → time_execution/decorator.py b/time_execution/time_execution.py → time_execution/decorator.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from .time_execution import *
		from .decorator import *