resolve conflicts

Jingjing Tang · Jingjing Tang · commit eabe62436ac1 · 2020-06-11T10:55:20.000-04:00
diff --git a/jhu/delphi_jhu/run.py b/jhu/delphi_jhu/run.py
@@ -44,7 +44,7 @@
     "cumulative_prop":      ("cumulative_prop", False),
 }
 SMOOTHERS_MAP = {
-    "unsmoothed":           (identity, ''),
+    "unsmoothed":           (identity, '', False),
     #"seven_day_average":    (seven_day_moving_average, '7dav_', True),
 }
 GEO_RESOLUTIONS = [

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`"cumulative_prop": ("cumulative_prop", False),`
`45`	`45`	`}`
`46`	`46`	`SMOOTHERS_MAP = {`
`47`		`- "unsmoothed": (identity, ''),`
	`47`	`+ "unsmoothed": (identity, '', False),`
`48`	`48`	`#"seven_day_average": (seven_day_moving_average, '7dav_', True),`
`49`	`49`	`}`
`50`	`50`	`GEO_RESOLUTIONS = [`