fix systemd bug

Change-Id: I8a3f1eddba9525589757d4612a5060267ea0c5db
2023-06-05 13:55:17 +02:00 · 2023-06-05 13:55:17 +02:00 · e02c9b1378
commit e02c9b1378
parent 5a19103d0e
1 changed files with 0 additions and 4 deletions
--- 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