From f21c377b27b85d9a2314c586a6efbf3b270bb390 Mon Sep 17 00:00:00 2001
From: JayHuLBL <JianjunHu@lbl.gov>
Date: Thu, 11 Feb 2021 15:13:34 -0800
Subject: [PATCH] resolved conflication [ci skip]

---
 .../EnergyPlus/Validation/Actuator/LightsControl.mo           | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Buildings/ThermalZones/EnergyPlus/Validation/Actuator/LightsControl.mo b/Buildings/ThermalZones/EnergyPlus/Validation/Actuator/LightsControl.mo
index 9e31a06d1f0..f639c4837e3 100644
--- 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(