Fixed redirection file due to conflicts

msLinuxNinja · msLinuxNinja · commit 13da207ddc6e · 2020-01-13T23:55:41.000Z
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -45650,7 +45650,6 @@
       "redirect_document_id": true
     },
     {
-<<<<<<< HEAD
       "source_path": "articles/virtual-machines/workloads/redhat/redhat-byos.md",
       "redirect_url": "/azure/virtual-machines/workloads/redhat/byos",
       "redirect_document_id": false
@@ -45659,11 +45658,11 @@
       "source_path": "articles/virtual-machines/workloads/redhat/redhat-overview.md",
       "redirect_url": "/azure/virtual-machines/workloads/redhat/overview",
       "redirect_document_id": false
-=======
+    },
+    {
       "source_path": "articles/load-balancer/load-balancer-arm.md",
       "redirect_url": "/azure/load-balancer/load-balancer-overview",
       "redirect_document_id": true
->>>>>>> upstream/master
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -45650,7 +45650,6 @@`
`45650`	`45650`	`"redirect_document_id": true`
`45651`	`45651`	`},`
`45652`	`45652`	`{`
`45653`		`-<<<<<<< HEAD`
`45654`	`45653`	`"source_path": "articles/virtual-machines/workloads/redhat/redhat-byos.md",`
`45655`	`45654`	`"redirect_url": "/azure/virtual-machines/workloads/redhat/byos",`
`45656`	`45655`	`"redirect_document_id": false`
`@@ -45659,11 +45658,11 @@`
`45659`	`45658`	`"source_path": "articles/virtual-machines/workloads/redhat/redhat-overview.md",`
`45660`	`45659`	`"redirect_url": "/azure/virtual-machines/workloads/redhat/overview",`
`45661`	`45660`	`"redirect_document_id": false`
`45662`		`-=======`
	`45661`	`+ },`
	`45662`	`+ {`
`45663`	`45663`	`"source_path": "articles/load-balancer/load-balancer-arm.md",`
`45664`	`45664`	`"redirect_url": "/azure/load-balancer/load-balancer-overview",`
`45665`	`45665`	`"redirect_document_id": true`
`45666`		`->>>>>>> upstream/master`
`45667`	`45666`	`}`
`45668`	`45667`	`]`
`45669`	`45668`	`}`