Skip to content

Fix badly-handled conflict

username-removed-443319 requested to merge make-meal-expenses-foggier into master

In resolving the conflicts in https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3915, I overwrote some changes from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3735 😞

This puts those back, and keeps the changes from !3915 (merged).

Merge request reports