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.

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

File reader update with comment #230

Merged
merged 12 commits into from
Mar 21, 2022
Merged

Conversation

Jolijn2020
Copy link
Collaborator

Can now read in map files with comments

@Jolijn2020 Jolijn2020 linked an issue Mar 17, 2022 that may be closed by this pull request
src/main/java/app/model/Map.java Outdated Show resolved Hide resolved
src/main/java/app/model/Map.java Outdated Show resolved Hide resolved
src/main/java/app/model/Map.java Outdated Show resolved Hide resolved
src/main/java/app/controller/io/FileParser.java Outdated Show resolved Hide resolved
@S010MON S010MON linked an issue Mar 17, 2022 that may be closed by this pull request
@Jolijn2020 Jolijn2020 requested a review from S010MON March 18, 2022 20:30
Copy link
Collaborator

@MatthewFoster02 MatthewFoster02 left a comment

Choose a reason for hiding this comment

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

Works for me.

S010MON
S010MON previously approved these changes Mar 19, 2022
S010MON
S010MON previously approved these changes Mar 19, 2022
@Jolijn2020 Jolijn2020 dismissed stale reviews from S010MON and MatthewFoster02 via 7e9be04 March 20, 2022 11:25
@Jolijn2020
Copy link
Collaborator Author

why are do I always need to merge again :(

…ith_comment

# Conflicts:
#	src/main/java/app/controller/io/FileParser.java
#	src/main/java/app/model/Map.java
S010MON
S010MON previously approved these changes Mar 20, 2022
GwenTinho
GwenTinho previously approved these changes Mar 21, 2022
…ith_comment

# Conflicts:
#	src/main/java/app/model/Map.java
@Jolijn2020 Jolijn2020 dismissed stale reviews from GwenTinho and S010MON via 900301e March 21, 2022 12:15
@Jolijn2020 Jolijn2020 merged commit d81dc74 into master Mar 21, 2022
@Jolijn2020 Jolijn2020 deleted the FileReader_update_with_comment branch March 21, 2022 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update FileReader (with comments) update FileReader (without comments)
4 participants