fix: emqx.appup.src format

2022-07-25 08:54:33 +08:00 · 2022-07-25 08:54:33 +08:00 · 60e0b64434
parent 56eedf0c9d
commit 60e0b64434
1 changed files with 0 additions and 1 deletions
--- 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,[]},