Update Sample template with MR fix

Previous template mistakenly had MR conflicts and would send emails to users

Update Sample template with MR fix
Previous template mistakenly had MR conflicts and would send emails to users
4b6b7295 · Grant Young · Heinrich Lee Yu · bfddef57 · 4b6b7295 · 4b6b7295
Commit 4b6b7295 authored Feb 15, 2021 by Grant Young Committed by Heinrich Lee Yu Feb 15, 2021
Showing with 5 additions and 0 deletions

changelogs/unreleased/gy-fix-sample-template.yml changelogs/unreleased/gy-fix-sample-template.yml +5 -0

vendor/sample_data_templates/sample.tar.gz vendor/sample_data_templates/sample.tar.gz +0 -0

No files found.
--- a/changelogs/unreleased/gy-fix-sample-template.yml
+++ b/changelogs/unreleased/gy-fix-sample-template.yml
+---
+title: Update Sample GitLab Project Template with MR conflicts fix
+merge_request: 54248
+author:
+type: fixed
--- a/vendor/sample_data_templates/sample.tar.gz
+++ b/vendor/sample_data_templates/sample.tar.gz