From 894672b50c88ad38d7fc8d4d6cfa509609200d9c Mon Sep 17 00:00:00 2001 From: Sherif Nada Date: Tue, 16 Nov 2021 15:04:52 -0800 Subject: [PATCH] remove merge conflict from connector catalog docs page --- docs/integrations/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/integrations/README.md b/docs/integrations/README.md index 290a99fba06f..ebb3b2b66644 100644 --- 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