CE upstream - 2018-03-21 00:25 UTC
Files to resolve:
-
George Tsiolis Please resolve (DU) spec/javascripts/vue_shared/components/markdown/toolbar_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-21
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!