From 85161ec09a28bfe359beb8e7f6678c38f43d0741 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 19 Jun 2021 13:32:14 +0200
Subject: [PATCH] node to v16

---
 .github/workflows/pre_release.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml
index 3ca10f7c6..243cff4c4 100644
--- a/.github/workflows/pre_release.yml
+++ b/.github/workflows/pre_release.yml
@@ -52,8 +52,4 @@ jobs:
           files: |
             CHANGELOG_LATEST.md
             ./build/firmware/*.*
-<<<<<<< HEAD
             
-=======
-            
->>>>>>> fdbbfe8ddbbb49c610cf6ab68a0d11bc3c9855b1