Skip to content

Conversation

@MarnieRM
Copy link

@MarnieRM MarnieRM commented Feb 22, 2020

Added my name (Marnie Manning) to participants.txt and resolved the conflict between branch1 and branch2 by fixing the equation in file.txt.

@MarnieRM MarnieRM changed the title Added my name to participants.txt Added my name to participants.txt and fixed the equation in file.txt so it was the correct calculation. Feb 22, 2020
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.

2 participants