CE upstream - 2018-06-14 13:12 UTC
Files to resolve:
-
Jose Please resolve (UU) app/assets/stylesheets/framework/markdown_area.scss
-
Jose Please resolve (UU) app/assets/stylesheets/pages/merge_requests.scss
-
@digitalmoksha Please resolve (UU) doc/user/markdown.md
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-14
branch.
Thanks in advance!
@digitalmoksha After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Jose Ivan Vargas