remove merge conflict from connector catalog docs page

rfortmann-ewolff · Nov 16, 2021 · 894672b · 894672b
1 parent e15c2a9
commit 894672b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/integrations/README.md b/docs/integrations/README.md
@@ -150,9 +150,6 @@ Airbyte uses a grading system for connectors to help users understand what to ex
 | [S3](destinations/s3.md) | Certified |
 | [SQL Server \(MSSQL\)](destinations/mssql.md) | Alpha |
 | [Snowflake](destinations/snowflake.md) | Certified |
-<<<<<<< HEAD
 | [Cassandra](destinations/cassandra.md) | Alpha |
-=======
 | [Scylla](destinations/scylla.md) | Alpha |
->>>>>>> b92e2f803bb0610d05681ac0c4aec8e8fdee6e42