From 20d0125b880fcfefd4da8c10c548be94cdd8dfc0 Mon Sep 17 00:00:00 2001
From: thodkatz <thodkatz@gmail.com>
Date: Fri, 3 May 2019 18:46:40 +0300
Subject: [PATCH] Remove merge leftovers

---
 inc/Services/RequestVerificationService.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/inc/Services/RequestVerificationService.hpp b/inc/Services/RequestVerificationService.hpp
index ced3e8ae..2d091de4 100644
--- a/inc/Services/RequestVerificationService.hpp
+++ b/inc/Services/RequestVerificationService.hpp
@@ -115,7 +115,6 @@ public:
 	 * The data is actually some data members of Message that contain the basic info of the
 	 * telecommand packet that failed the routing
 	 * @param errorCode The cause of creating this type of report
-<<<<<<< HEAD
  	 */
 	void failRoutingVerification(const Message &request, ErrorHandler::RoutingErrorType errorCode);
 };
-- 
GitLab