From 9aca05b225a8aec42047092720a0127fed8a12e5 Mon Sep 17 00:00:00 2001
From: Simon H <5968653+dummdidumm@users.noreply.github.com>
Date: Thu, 20 Apr 2023 15:44:13 +0200
Subject: [PATCH] fix changelog

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 394248023a..136f106121 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,6 @@
 
 ## Unreleased (4.0)
 
-<<<<<<< HEAD
-* Minimum supported Node version is now Node 14
-=======
 * **breaking** Minimum supported Node version is now Node 14
 * **breaking** Minimum supported webpack version is now webpack 5
 * **breaking** Minimum supported TypeScript version is now TypeScript 5 (it will likely work with lower versions, but we make no guarantees about that)
@@ -14,7 +11,6 @@
 * Add `a11y no-noninteractive-element-interactions` rule ([#8391](https://github.com/sveltejs/svelte/pull/8391))
 * Add `a11y-no-static-element-interactions`rule ([#8251](https://github.com/sveltejs/svelte/pull/8251))
 * Bind `null` option and input values consistently ([#8312](https://github.com/sveltejs/svelte/issues/8312))
->>>>>>> upstream/version-4
 
 ## Unreleased (3.0)