From b82748f17b7266e3ede4f5430015a8ae67820db8 Mon Sep 17 00:00:00 2001
From: sergeizharko <zharkosergey94@yandex.ru>
Date: Sun, 19 Dec 2021 03:06:29 +0100
Subject: [PATCH] Added new class L1BaseStationInfo to the L1Algo core
---
reco/L1/L1Algo/L1BaseStationInfo.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index ae09356723..8407c5ad8f 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -2,7 +2,11 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergey Gorbunov, Sergei Zharko [committer] */
+<<<<<<< HEAD
/************************************************************************************************************
+=======
+/**************************************************************************************************************
+>>>>>>> Added new class L1BaseStationInfo to the L1Algo core
* @file L1BaseStationInfo.h
* @bried A base class for a L1 station interface
* @since 18.12.2021
--
GitLab