From 532e4a7ab524fa0b3e228885342e26d2df127250 Mon Sep 17 00:00:00 2001
From: Markus Zolliker <markus.zolliker@psi.ch>
Date: Wed, 31 May 2023 14:16:12 +0200
Subject: [PATCH] update 2023-05-30 from gitmlz

Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
---
 frappy/params.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappy/params.py b/frappy/params.py
index 8d33871..a2e0639 100644
--- a/frappy/params.py
+++ b/frappy/params.py
@@ -169,7 +169,11 @@ 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