Open
Conversation
Henry information added
Justins information added
philip gouldman information added
Geri's info added
Henry information added
AndrewN information added
jason_ramsey information added
Noah information added
akshaya information added 👍
Jeremy information added
VladDobrin info added
Generate conflicts
FuadBalashov
reviewed
Sep 5, 2017
| <favoriteCereal>Frosted Flakes</favoriteCereal> | ||
| <funFact>I love steak</funFact> | ||
| </participant> | ||
| ======= |
Owner
There was a problem hiding this comment.
hey jasmine, can you delete:
the lower section of this file,
the <<<<<<<<< HEAD,
the ========= and the
>>>>>>>>> f152d92687454df13d2345f54aedce2ed017041e
it should look like:
<participant>
<name>Jazmine Smith</name>
<favoriteCereal>Frosted Flakes</favoriteCereal>
<funFact>I love steak</funFact>
</participant>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
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.
:)