Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

account correctely for msw co2 #1256

Merged
merged 5 commits into from
Sep 4, 2024
Merged

account correctely for msw co2 #1256

merged 5 commits into from
Sep 4, 2024

Conversation

p-glaum
Copy link
Contributor

@p-glaum p-glaum commented Sep 3, 2024

extract co2 emissions of oil from msw when msw goes to hvc non sequestered bus.

environment.yaml: add license comment

Closes # (if applicable).

Changes proposed in this Pull Request

Checklist

  • I tested my contribution locally and it seems to work fine.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in all of config.default.yaml.
  • Changes in configuration options are also documented in doc/configtables/*.csv.
  • A release note doc/release_notes.rst is added.

@p-glaum p-glaum requested a review from lisazeyen September 3, 2024 12:13
Copy link
Contributor

@lisazeyen lisazeyen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@p-glaum great, looks good! Can you just restore the doc/*.rst files which you haven't changed? Then we can pull it into the main branch

@p-glaum
Copy link
Contributor Author

p-glaum commented Sep 4, 2024

Hi Lisa, I can do that but this was the CI. Not sure if something changed with the pre-commit settings but this happened automatically when I committed my changes

@lisazeyen
Copy link
Contributor

Hi Lisa, I can do that but this was the CI. Not sure if something changed with the pre-commit settings but this happened automatically when I committed my changes

Alright then we just merge it!

@lisazeyen lisazeyen enabled auto-merge September 4, 2024 06:31
@p-glaum
Copy link
Contributor Author

p-glaum commented Sep 4, 2024

okay never mind. This resolved automatically, when I merged the new master. Apparently, @lindnemi's PR #1257 made exactly the same changes as my pre-commit did, so now the changed files for the docs do not appear anymore in my PR.

@lisazeyen lisazeyen merged commit b328169 into master Sep 4, 2024
8 checks passed
@p-glaum p-glaum deleted the fix_msw branch September 4, 2024 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants