fix merge conflict

reyang · reyang · commit b5e9679b006f · 2019-04-17T12:01:28.000-07:00
diff --git a/opencensus/common/configuration/__init__.py b/opencensus/common/configuration/__init__.py
@@ -14,7 +14,7 @@
 
 import importlib
 
-__all__ = ['Namespace', 'eval']
+__all__ = ['Namespace', 'load']
 
 
 class Namespace(object):
