From aac46815b5431d4889a3be20875db9c374c0fe1a Mon Sep 17 00:00:00 2001
From: Ajith Vasudevan <ajith.vasudevan@gmail.com>
Date: Mon, 15 Feb 2021 16:34:06 +0530
Subject: [PATCH] Resolved conflicts

---
 tasmota/xdrv_13_display.ino | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tasmota/xdrv_13_display.ino b/tasmota/xdrv_13_display.ino
index c52fdbb0f..e119c1117 100755
--- a/tasmota/xdrv_13_display.ino
+++ b/tasmota/xdrv_13_display.ino
@@ -94,8 +94,7 @@ enum XdspFunctions { FUNC_DISPLAY_INIT_DRIVER, FUNC_DISPLAY_INIT, FUNC_DISPLAY_E
                      , FUNC_DISPLAY_NUMBER, FUNC_DISPLAY_FLOAT,
                      FUNC_DISPLAY_NUMBERNC, FUNC_DISPLAY_FLOATNC, FUNC_DISPLAY_BRIGHTNESS, FUNC_DISPLAY_RAW,
                      FUNC_DISPLAY_LEVEL, FUNC_DISPLAY_SEVENSEG_TEXT, FUNC_DISPLAY_SEVENSEG_TEXTNC,
-                     FUNC_DISPLAY_SCROLLDELAY, FUNC_DISPLAY_CLOCK };
-
+                     FUNC_DISPLAY_SCROLLDELAY, FUNC_DISPLAY_CLOCK
                    };
 
 enum DisplayInitModes { DISPLAY_INIT_MODE, DISPLAY_INIT_PARTIAL, DISPLAY_INIT_FULL };