CE upstream - 2018-08-08 07:57 UTC
Files to resolve:
-
@winh Please resolve (UU) app/assets/stylesheets/pages/profile.scss
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-08 branch.
Thanks in advance!
@winh 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 Bob Van Landuyt