fixed conflict

vkurpad · vkurpad · commit 6def38f0569b · 2019-12-03T21:32:06.000-08:00
diff --git a/articles/search/search-howto-incremental-index.md b/articles/search/search-howto-incremental-index.md
@@ -39,11 +39,7 @@ api-key: [admin key]
 
 ### Step 2: Add the cache property
 
-<<<<<<< HEAD
 Edit the response from the GET request to add the `cache` property to the indexer. The cache object requires only a single property, `storageConnectionString` which is the connection string to the storage account. 
-=======
-Edit the response from the GET request to add the `cache` property to the indexer. The cache object requires only a single property, and that is the connection string to an Azure Storage account.
->>>>>>> 3519a330aa86b6827d31403690529105825b1b16
 
 ```json
 {

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,7 @@ api-key: [admin key]`
`39`	`39`
`40`	`40`	`### Step 2: Add the cache property`
`41`	`41`
`42`		`-<<<<<<< HEAD`
`43`	`42`	Edit the response from the GET request to add the `cache` property to the indexer. The cache object requires only a single property, `storageConnectionString` which is the connection string to the storage account.
`44`		`-=======`
`45`		-Edit the response from the GET request to add the `cache` property to the indexer. The cache object requires only a single property, and that is the connection string to an Azure Storage account.
`46`		`->>>>>>> 3519a330aa86b6827d31403690529105825b1b16`
`47`	`43`
`48`	`44`	```json
`49`	`45`	`{`