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.

Sign up for GitHub

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

Jump to bottom

Fix merge conflicts in prepare_sector_network #14

Merged
merged 3 commits into from
Oct 14, 2024
Merged

Fix merge conflicts in prepare_sector_network #14

merged 3 commits into from
Oct 14, 2024

Conversation

tgilon
Copy link

@tgilon tgilon commented Oct 4, 2024

Changes proposed in this Pull Request

This PR fix merge conflicts in prepare_sector_network

Checklist

  • I tested my contribution locally and it works as intended.
  • Code and workflow changes are sufficiently documented.
  • Changed dependencies are added to envs/environment.yaml.
  • Changes in configuration options are added in config/config.default.yaml.
  • Changes in configuration options are documented in doc/configtables/*.csv.
  • Sources of newly added data are documented in doc/data_sources.rst.
  • A release note doc/release_notes.rst is added.

@tgilon tgilon requested a review from martacki October 4, 2024 18:49
@tgilon tgilon mentioned this pull request Oct 4, 2024
Closed
tgilon and others added 2 commits October 10, 2024 15:15
@tgilon @martacki
Update scripts/prepare_sector_network.py
61ee4b1 
Co-authored-by: Martha Frysztacki <martha.frysztacki@gmail.com>
@tgilon
Fix indentation
2404ffa
@martacki martacki merged commit 4810f90 into open-energy-transition:master Oct 14, 2024
@tgilon tgilon deleted the fix/fix-merge branch October 23, 2024 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martacki martacki martacki left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tgilon @martacki