From 7b37d65fd8ffc3e06737a6815a4beadf08ec5f12 Mon Sep 17 00:00:00 2001
From: Jesko Steinberg <jesko.steinberg@sda.se>
Date: Fri, 30 Oct 2020 11:02:57 +0100
Subject: [PATCH] fix: update github-insights-plugin to resolve conflicts

---
 .changeset/3157.md               |  9 +++++++++
 .changeset/wet-tools-exercise.md | 15 ---------------
 2 files changed, 9 insertions(+), 15 deletions(-)
 create mode 100644 .changeset/3157.md
 delete mode 100644 .changeset/wet-tools-exercise.md

diff --git a/.changeset/3157.md b/.changeset/3157.md
new file mode 100644
index 0000000000..d6c0120d8a
--- /dev/null
+++ b/.changeset/3157.md
@@ -0,0 +1,9 @@
+---
+'@backstage/core': minor
+---
+
+Adds the MarkdownContent component to render and display markdown input.
+
+```
+  <MarkdownContent content={markdown} />
+```
diff --git a/.changeset/wet-tools-exercise.md b/.changeset/wet-tools-exercise.md
deleted file mode 100644
index ba6eb8314f..0000000000
--- a/.changeset/wet-tools-exercise.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-'@backstage/core': minor
----
-
-Adds the MarkdownContent component to render and display markdown input.
-
-```
-  <MarkdownContent content={markdown} />
-```
-
-Render and display the github flavored markdown [GFM](https://github.github.com/gfm/) input:
-
-```
- <MarkdownContent content={markdownGithubFlavored} enableGfm />
-```