resolving conflicts

MashaMSFT · MashaMSFT · commit 040301e6dea1 · 2020-05-20T08:26:37.000-07:00
diff --git a/azure-sql/includes/appliesto-asf.md b/azure-sql/includes/appliesto-asf.md
@@ -1,2 +1,2 @@
-<Token>**APPLIES TO:** ![yes](../media/applies-to/yes.png)Azure SQL family</Token>
+<Token>**APPLIES TO:** ![yes](../media/applies-to/yes.png)Azure SQL Database ![yes](../media/applies-to/yes.png)Azure SQL Managed Instance ![yes](../media/applies-to/yes.png)SQL Server on Azure VM</Token>
 
diff --git a/azure-sql/includes/appliesto-sqldb-sqlmi-asa.md b/azure-sql/includes/appliesto-sqldb-sqlmi-asa.md
@@ -1,2 +1,2 @@
-<Token>**APPLIES TO:** ![yes](../media/applies-to/yes.png)Azure SQL Database ![yes](../media/applies-to/yes.png)Azure SQL Managed Instance ![yes](../media/applies-to/yes.png) Azure Synapse Analytics</Token>
+<Token>**APPLIES TO:** ![yes](../media/applies-to/yes.png)Azure SQL Database ![yes](../media/applies-to/yes.png)Azure SQL Managed Instance ![yes](../media/applies-to/yes.png) Azure Synapse Analytics (Preview) </Token>
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-<Token>APPLIES TO: ![yes](../media/applies-to/yes.png)Azure SQL family</Token>`
	`1`	`+<Token>APPLIES TO: ![yes](../media/applies-to/yes.png)Azure SQL Database ![yes](../media/applies-to/yes.png)Azure SQL Managed Instance ![yes](../media/applies-to/yes.png)SQL Server on Azure VM</Token>`
`2`	`2`