Merge developer changes #48
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
# Conflicts: # docs/UserGuide.adoc
* 'master' of https://github.com/AY1920S1-CS2103T-T17-2/main: (38 commits) v1.4 finalise Update UserGuide.adoc Update DeveloperGuide.adoc UG refractor Update pohlinwei.adoc Update UML class diagrams and images Update pohlinwei.adoc Redo bug fixes Update UserGuide.adoc Update UserGuide.adoc Redo bug fix Redo bug fix Update DeveloperGuide.adoc Update DeveloperGuide.adoc Update DeveloperGuide.adoc Update DeveloperGuide.adoc Update UML Diagrams in Developer Guides Update DeveloperGuide.adoc Update DeveloperGuide.adoc Update DeveloperGuide.adoc ... # Conflicts: # docs/UserGuide.adoc
v1.4 implementation
Clear checkstyle and update UG
Update UML diagrams
UG DG refractor
Fix checkstyle
final tweak
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.