Merged

mtna · Jun 20, 2020 · fee2a23 · fee2a23
1 parent 8bd44b2
commit fee2a23
Show file tree

Hide file tree

Showing 9 changed files with 529 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,12 +18,6 @@
 .spyproject/config/backups/encoding.ini.bak
 .spyproject/config/backups/vcs.ini.bak
 .spyproject/config/backups/workspace.ini.bak
-<<<<<<< HEAD
-
-build
-dist
-rds.egg-info
-=======
 rds/__pycache__/dataproduct.cpython-37.pyc
 rds/__pycache__/__init__.cpython-37.pyc
 tests/__pycache__/test_rds.cpython-37-pytest-5.4.2.pyc
@@ -32,4 +26,3 @@ rds/__init__.pyc
 rds/dataproduct.pyc
 tests/__init__.pyc
 tests/__pycache__/test_rds.cpython-27-PYTEST.pyc
->>>>>>> 5390867fec909a8c0aa036814abedc913cd1b5da
diff --git a/build/lib/rds/__init__.py b/build/lib/rds/__init__.py
@@ -0,0 +1,4 @@
+#
+from .dataproduct import DataProduct
+
+__all__ = ['DataProduct']