diff --git a/README.md b/README.md index 493828a..577350e 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,3 @@ -<<<<<<< HEAD -# ce - -community edition of data-transport -======= # Introduction This project implements an abstraction of objects that can have access to a variety of data stores, implementing read/write with a simple and expressive interface. This abstraction works with **NoSQL**, **SQL** and **Cloud** data stores and leverages **pandas**. @@ -37,4 +32,3 @@ Options to install components in square brackets ## Learn More We have available notebooks with sample code to read/write against mongodb, couchdb, Netezza, PostgreSQL, Google Bigquery, Databricks, Microsoft SQL Server, MySQL ... Visit [data-transport homepage](https://healthcareio.the-phi.com/data-transport) ->>>>>>> v2.2.0