resolve conflict in doc/ci/variables/where_variables_can_be_used.md

doc/ci/variables/where_variables_can_be_used.md

@@ -110,7 +110,6 @@ They are:
 - **Not supported:**
   - By the definitions [described in the table](#gitlab-ci-yml-file) where the "Expansion place" is "GitLab".
   - In the `only` and `except` [variables expressions](README.md#variables-expressions).
-<<<<<<< HEAD
 
 ## Variables with an environment scope
 
@@ -130,5 +129,3 @@ my-job:
     variables:
       - $STAGING_SECRET == 'something'
 ```
-=======
->>>>>>> upstream/master