Add industrial heat production#41
Draft
bennet21 wants to merge 3 commits intoPhilippVerpoort:mainfrom
Draft
Conversation
370cd4f to
7a428bf
Compare
7a428bf to
5c41d9a
Compare
039ed77 to
95daa48
Compare
Author
|
I noticed the main branch history was recently updated, which caused some merge conflicts here. I've successfully rebased my commits onto the new main and force-pushed to sync everything up. |
5c41d9a to
f28bae3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds industrial heat data as found in CaCoCa. Other techno-economic data from CaCoCa will be added in a separate PR.
Before this can be merged, the following points have to be adressed:
sources.bib.