From 60e0b644342c1184eb903df212f18035a43a0cec Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Mon, 25 Jul 2022 08:54:33 +0800
Subject: [PATCH] fix: emqx.appup.src format

---
 src/emqx.appup.src | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 31bdd5a58..d6d20aa0f 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -1,7 +1,6 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-<<<<<<< HEAD
   [{"4.4.5",
     [
      {load_module,emqx_relup,brutal_purge,soft_purge,[]},