Resolve conflict with main

alexhyunminlee · alexhyunminlee · commit aa39595be383 · 2026-02-09T19:31:01.000Z
diff --git a/rate_design/ny/hp_rates/run_scenario.py b/rate_design/ny/hp_rates/run_scenario.py
@@ -165,7 +165,6 @@
     run_name=run_name,
     output_dir=path_results,  # will default to this folder if not pass, mostly testing ability for user to pass arbitrary output directory
 )
-# bs.tariff_map = tariff_map_name
 
 # TODO: add (maybe post-processing)module for delivered fuels bills
 bs.simulate(

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,6 @@`
`165`	`165`	`run_name=run_name,`
`166`	`166`	`output_dir=path_results, # will default to this folder if not pass, mostly testing ability for user to pass arbitrary output directory`
`167`	`167`	`)`
`168`		`-# bs.tariff_map = tariff_map_name`
`169`	`168`
`170`	`169`	`# TODO: add (maybe post-processing)module for delivered fuels bills`
`171`	`170`	`bs.simulate(`