resolve conflicts

Jingjing Tang · Jingjing Tang · commit cc203c6ab59e · 2020-06-19T10:05:49.000-04:00
diff --git a/jhu/delphi_jhu/run.py b/jhu/delphi_jhu/run.py
@@ -45,7 +45,7 @@
 }
 SMOOTHERS_MAP = {
     "unsmoothed":           (identity, '', False),
-    #"seven_day_average":    (seven_day_moving_average, '7dav_', True),
+    "seven_day_average":    (seven_day_moving_average, '7dav_', True),
 }
 GEO_RESOLUTIONS = [
     "county",

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