From 37045859da286afb94b10f14cc19163b7f26d8b3 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 11 May 2021 19:28:30 +1200
Subject: [PATCH] Fix missed merge conflict (#1155)

---
 components/light/index.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/light/index.rst b/components/light/index.rst
index fa3de18bd..73fc1862b 100644
--- a/components/light/index.rst
+++ b/components/light/index.rst
@@ -900,10 +900,7 @@ Configuration variables:
 
 - **method** (*Optional*): Listening method, one of ``multicast`` or ``unicast``. Defaults to ``multicast``.
 
-<<<<<<< HEAD
 The udp port esphome is listening on is 5568.
-=======
->>>>>>> current
 
 .. _E1.31: https://www.doityourselfchristmas.com/wiki/index.php?title=E1.31_(Streaming-ACN)_Protocol
 .. _JINX: http://www.live-leds.de/jinx-v1-3-with-resizable-mainwindow-real-dmx-and-sacne1-31/