Skip to content

Remove traces of merge conflicts

Jaime Martinez requested to merge remove-traces-of-conflicts into master

Why is this change being made?

Remove some traces of merge conflicts. I found these while doing a global search for >>>> characters. <<<< didn't return anything else.

Screenshots

Screen_Shot_2020-07-31_at_2.21.25_pm

Screen_Shot_2020-07-31_at_2.22.10_pm

Author Checklist

  • Provided a concise title for the MR
  • Added a description to this MR explaining the reasons for the proposed change, per [say-why-not-just-what][transparency]
  • Assign this change to the correct DRI
    • If the DRI for the page/s being updated isn’t immediately clear, then assign it to your manager.
    • If your manager does not have merge rights, please ask someone to merge it AFTER it has been approved by your manager in [#mr-buddies][mr-buddies-slack].
    • If the changes relate to any part of the project other than updates to content and/or data files please make sure to ping @gl-static-site-editor in a comment for a review and merge. For example changes to .gitlab-ci.yml, JavaScript/CSS/Ruby code or the layout files.
Edited by Jaime Martinez

Merge request reports