Merge branch 'gy-fix-sample-template' into 'master'

Update Sample GitLab Project Template with MR conflicts fix See merge request gitlab-org/gitlab!54248

Merge branch 'gy-fix-sample-template' into 'master'
Update Sample GitLab Project Template with MR conflicts fix See merge request gitlab-org/gitlab!54248
bd4937e2 · Heinrich Lee Yu · 1dfe8f82 · 4b6b7295 · bd4937e2 · bd4937e2
Commit bd4937e2 authored Feb 15, 2021 by Heinrich Lee Yu
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