resolved conflication [ci skip]

lbl-srg · Feb 11, 2021 · f21c377 · f21c377
1 parent 7816e08
commit f21c377
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/Actuator/LightsControl.mo b/Buildings/ThermalZones/EnergyPlus/Validation/Actuator/LightsControl.mo
@@ -12,13 +12,9 @@ model LightsControl
   Buildings.ThermalZones.EnergyPlus.OutputVariable ligPow(
     name="Lights Electricity Rate",
     key="LIVING ZONE Lights",
-<<<<<<< HEAD
-    y(final unit="W"))
-=======
     isDirectDependent=true,
     y(
       final unit="W"))
->>>>>>> master
     "Block that reads output from EnergyPlus"
     annotation (Placement(transformation(extent={{100,60},{120,80}})));
   Controls.OBC.CDL.Utilities.SunRiseSet sunRiseSet(