From 9092e6b3e95542a0abc2699ad964088850552f8f Mon Sep 17 00:00:00 2001 From: Julien Benchetrit Date: Mon, 25 Feb 2019 19:05:24 +0200 Subject: [PATCH] Manually fix conflict between master and dev to enable merging master into dev (hopefully) --- .github/issue-close-app.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/issue-close-app.yml b/.github/issue-close-app.yml index 3a8eb1624e..18794e3d03 100644 --- a/.github/issue-close-app.yml +++ b/.github/issue-close-app.yml @@ -1,7 +1,14 @@ -comment: "This issue was automatically closed because it does not follow our template. Please open a new issue and fill out the template that appears instead of deleting it. It's especially important that you provide detailed steps for how to reproduce your issue." +comment: This issue was automatically closed because it does not follow either one of our templates. Please open a new issue and fill out the template that appears instead of deleting it. If you're reporting an issue, it's especially important that you provide detailed steps for how to reproduce it. + issueConfigs: + - content: - - "Issue Type" - - "Description" - - "Steps to reproduce" - - "Versions" + - Description + - Steps to reproduce + - Versions + + - content: + - Is your feature request related to a problem + - Describe the solution you'd like + - Describe alternatives you've considered + - Additional context