Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
aesharpe committed Nov 8, 2024
2 parents 2a75667 + 51f5490 commit 4427688
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ EIA 930

EIA Bulk Electricity Data
~~~~~~~~~~~~~~~~~~~~~~~~~
* Updated the EIA Bulk Electricity data archive to include data that was available
as of 2024-11-01, which covers up through 2024-08-01 (3 months more than the
previously used archive). See :issue:`3944` and PR :pr:`3951`.
* Updated the EIA Bulk Electricity data to include data published up through
2024-08-01. See :issue:`3944` and PR :pr:`3951`.

EPA CEMS
~~~~~~~~
Expand Down

0 comments on commit 4427688

Please sign in to comment.