SONAR-14851 Fix documentation page

diff --git a/server/sonar-docs/src/pages/analysis/github-integration.md b/server/sonar-docs/src/pages/analysis/github-integration.md
index a74bb996b95f7d28683cf6be221644a64a8c9622..0922d825eeb37b77037aadf59c3378148521aa2c 100644 (file)
--- a/server/sonar-docs/src/pages/analysis/github-integration.md
+++ b/server/sonar-docs/src/pages/analysis/github-integration.md
@@ -275,11 +275,7 @@ You can use the [SonarQube Quality Gate Check GitHub Action](https://github.com/
 
 If you do not want to use the SonarQube Quality Gate Check Action, you can instruct the scanner to wait for the SonarQube Quality Gate status at the end of the analysis. To enable this, pass the `-Dsonar.qualitygate.wait=true` parameter to the scanner in the workflow YAML file.
 
-<<<<<<< HEAD
 This will make the analysis step poll SonarQube regularly until the Quality Gate is computed. This will increase your pipeline duration. Note that, if the Quality Gate is red, this will make the analysis step fail, even if the actual analysis itself is successful. We advise only using this parameter when necessary (for example, to block a deployment pipeline if the Quality Gate is red). It should not be used to report the Quality Gate status in a pull request, as this is already done with pull request decoration.
-=======
-This will make the analysis step poll SonarQube regularly until the Quality Gate is computed. This will increase your pipeline duration. Note that, if the Quality Gate is red, this will make the analysis step fail, even if the actual analysis itself is successful. We advise only using this parameter when necessary (for example, to block a deployment pipeline if the Quality Gate is red). It should not be used to report the Quality Gate status in a pull request.
->>>>>>> SONAR-14851 Report Quality Gate status on branches in GitHub
 
 You can set the `sonar.qualitygate.timeout` property to an amount of time (in seconds) that the scanner should wait for a report to be processed. The default is 300 seconds.