fix merge issue

dpinney · Jan 4, 2024 · 703cbd8 · 703cbd8
1 parent 03dd024
commit 703cbd8
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/omf/models/restoration.py b/omf/models/restoration.py
@@ -847,10 +847,7 @@ def coordStrFormatter(coordString):
 	try:
 		customerOutageData = pd.read_csv(pathToCsv)
 	except:
-<<<<<<< HEAD
 		# TODO: Needs to be updated to provide info for all loads, not just shed loads. Outage Incidence plot is dependent on all loads
-=======
->>>>>>> f9e2220aec562c162c42d26421b2721c11b42af6
 		deviceTimeline = data["Device action timeline"]
 		loadsShed = []
 		for line in deviceTimeline: