Resolved merge conflict

livecodepanos · livecodepanos · commit e9d951722bac · 2019-02-21T09:29:45.000+02:00
diff --git a/extensions/widgets/clock/tests/properties.livecodescript b/extensions/widgets/clock/tests/properties.livecodescript
@@ -40,7 +40,6 @@ on TestSettingLocalTimeZone
 	TestAssert "timeZone successfully set to local", the timeZone of widget "testClock" is ""
 end TestSettingLocalTimeZone
 
-<<<<<<< HEAD
 on TestGetDefaultFaceColor
    TestAssert "dayFaceColor on creation is 224,224,224,64", the dayFaceColor of widget "testClock" is "224,224,224,64"
    TestAssert "nightFaceColor on creation is black", the nightFaceColor of widget "testClock" is "0,0,0,255"
