Resolve the merge conflict #280
Merged
Conversation
This file contains 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
Main to develop
* update restoration util construction * changelog entry
* add parameter and also citation * changelog * update the markdown link
* Added multiple hazards from local * added description * removed unused packages * added zip * updated zip * Update CHANGELOG.md * added tutorials.md * added files * Update _toc.yml * Update _toc.yml
* Commercial buildings added * Adding changelog and references * Corrections * Update commercial_building_recovery.md * Update commercial_building_recovery.md
robkooper
approved these changes
Oct 11, 2023
navarroc
approved these changes
Oct 11, 2023
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.
No description provided.