manually fix merge conflict

austinmccollum · web-flow · commit f2b60becb7e9 · 2024-09-16T02:55:07.000-05:00
diff --git a/.openpublishing.redirection.sentinel.json b/.openpublishing.redirection.sentinel.json
@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/best-practices-workspace-architecture.md",
+            "redirect_url": "/azure/azure-monitor/logs/workspace-design",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/sentinel/design-your-workspace-architecture.md",
+            "redirect_url": "/azure/azure-monitor/logs/workspace-design",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/sentinel/notebooks-troubleshoot.md",
             "redirect_url": "/azure/sentinel/notebooks-hunt",
@@ -1655,6 +1665,5 @@
             "redirect_url": "/azure/sentinel/data-connectors/cyber-blind-spot-integration",
             "redirect_document_id": false
         }
-        
     ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,15 @@`
`1`	`1`	`{`
`2`	`2`	`"redirections": [`
	`3`	`+ {`
	`4`	`+ "source_path": "articles/sentinel/best-practices-workspace-architecture.md",`
	`5`	`+ "redirect_url": "/azure/azure-monitor/logs/workspace-design",`
	`6`	`+ "redirect_document_id": false`
	`7`	`+ },`
	`8`	`+ {`
	`9`	`+ "source_path": "articles/sentinel/design-your-workspace-architecture.md",`
	`10`	`+ "redirect_url": "/azure/azure-monitor/logs/workspace-design",`
	`11`	`+ "redirect_document_id": false`
	`12`	`+ },`
`3`	`13`	`{`
`4`	`14`	`"source_path": "articles/sentinel/notebooks-troubleshoot.md",`
`5`	`15`	`"redirect_url": "/azure/sentinel/notebooks-hunt",`
`@@ -1655,6 +1665,5 @@`
`1655`	`1665`	`"redirect_url": "/azure/sentinel/data-connectors/cyber-blind-spot-integration",`
`1656`	`1666`	`"redirect_document_id": false`
`1657`	`1667`	`}`
`1658`		`-`
`1659`	`1668`	`]`
`1660`	`1669`	`}`