From 59e0e3373b15dccfdff7605b27660a93772efbdf Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 2 Feb 2021 10:23:42 +0100
Subject: [PATCH] mipsbox/hdmi-cec: fix viral merge error

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/19d5dc6aa17afc45d07fde66a9a08ee18d361577
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-02-02 (Tue, 02 Feb 2021)

Origin message was:
------------------
- mipsbox/hdmi-cec: fix viral merge error

------------------
This commit was generated by Migit
---
 libmipsbox/hdmi_cec.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/libmipsbox/hdmi_cec.cpp b/libmipsbox/hdmi_cec.cpp
index 344c1f4..8504372 100644
--- a/libmipsbox/hdmi_cec.cpp
+++ b/libmipsbox/hdmi_cec.cpp
@@ -594,15 +594,9 @@ void hdmi_cec::run()
 	struct epoll_event event;
 	event.data.fd = hdmiFd;
 	event.events = EPOLLIN;
-<<<<<<< HEAD
 
 	epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
-
-=======
-
-	epoll_ctl(epollfd, EPOLL_CTL_ADD, hdmiFd, &event);
-
->>>>>>> e24aae1... cec volume switch audiosystem/tv
+	
 	std::array<struct epoll_event, EPOLL_MAX_EVENTS> events;
 
 	while (running)