resolve merge conflict

[wakeup.git] / test / sunset_alarms.xml

diff --git a/test/sunset_alarms.xml b/test/sunset_alarms.xml
index 4ff475d..44e14b3 100644 (file)
--- a/test/sunset_alarms.xml
+++ b/test/sunset_alarms.xml
@@ -15,7 +15,7 @@
        <pattern>days</pattern>
        <number>1</number>
     </recurrance>
-    <action>lightcontrol -b 50 -w 0 -f 9</action>
+    <action>lightcontrol -b 50 -w 0 -f 900 -a 1000</action>
   </event>
   <event id='lights_off'>
     <start>2020-04-02 22:30</start>
@@ -23,7 +23,7 @@
        <pattern>days</pattern>
        <number>1</number>
     </recurrance>
-    <action>lightcontrol -b 0 -f 18</action>
+    <action>lightcontrol -b 0 -f 1800 -a 1000</action>
   </event>
   <event id='end_test'>
     <start>2020-04-08 11:00</start>