rebase

Author: danthelion

README.md

@@ -125,14 +125,11 @@ $ data-diff \
 | BigQuery | `bigquery://<project>/<dataset>` | 💛 |
 | Redshift | `redshift://<username>:<password>@<hostname>:5439/<database>` | 💛 |
 | Presto | `presto://<username>:<password>@<hostname>:8080/<database>` | 💛 |
-<<<<<<< HEAD
 | Databricks | `databricks://<http_path>:<access_token>@<server_hostname>/<catalog>/<schema>` | 💛 |
 | ElasticSearch | | 📝 | | 📝 |
-=======
 | Trino | `trino://<username>:<password>@<hostname>:8080/<database>` | 💛 |
 | ElasticSearch | | 📝 |
 | Databricks | | 📝 |
->>>>>>> 0d3fd47 (Add Trino connector)
 | Planetscale | | 📝 |
 | Clickhouse | | 📝 |
 | Pinot | | 📝 |