Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

Merge remote changes to use_case/tariff_design #828

Conversation

dchassin
Copy link
Member

Merge Hector's fork into slacgismo branch

Copy link
Member Author

@dchassin dchassin left a comment

Choose a reason for hiding this comment

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

Delete the following files before merging:

  • revenue/autotest/test_billing.glm
  • revenue/autotest/billing.csv

Do not change the following files:

  • revenue/autotest/house.glm
  • revenue/autotest/test_billing.py

Manually merge changes to the following:

  • revenue/autotest/pgande_res_200301.glm

@dchassin dchassin changed the title Documentation Merge remote changes to use_case/tariff_design Dec 18, 2020
@HectorTR HectorTR marked this pull request as ready for review December 22, 2020 20:08
@aivanova5 aivanova5 merged commit 2572746 into arras-energy:use_case/tariff_design Jan 6, 2021
@aivanova5 aivanova5 mentioned this pull request Jan 14, 2021
11 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants