From e02c9b1378a426199ce0177a36c26a26760bfc83 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Mon, 5 Jun 2023 13:55:17 +0200
Subject: [PATCH] fix systemd bug

Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
---
 frappy/params.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frappy/params.py b/frappy/params.py
index a2e0639..8d33871 100644
--- a/frappy/params.py
+++ b/frappy/params.py
@@ -169,11 +169,7 @@ class Parameter(Accessible):
         OrType(FloatRange(0), EnumType(always=0, never=999999999, default=-1)),
         export=False, default=-1)
     influences = Property(
-<<<<<<< HEAD
         'optional hint about affected parameters', ArrayOf(StringType()),
-=======
-        'optional hint about effected parameters', ArrayOf(StringType()),
->>>>>>> update 2023-05-30 from gitmlz
         extname='influences', export=True, mandatory=False, default=[])
 
     # used on the instance copy only