assignment donzo - #113
Open
memyselfandhai wants to merge 13 commits into
Open
assignment donzo#113memyselfandhai wants to merge 13 commits into
memyselfandhai wants to merge 13 commits into
Conversation
|
We need to review more |
JohnRPB
reviewed
Oct 24, 2017
| <<<<<<< HEAD | ||
| - nu uh -hai conflict conflict conflict | ||
| ======= | ||
| - etc etc etc. |
Author
|
something something conflict
…On Tue, Oct 24, 2017 at 3:31 PM Johann ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In README.md
<#113 (comment)>
:
> @@ -109,4 +109,11 @@ Whatever I want is here. -- Driver Erik
ANYTHING. DO SOME CODE. -- Driver Erik
-
+ANYTHING. I HAVE DONE IT.
+
+Yadda yadda yadda, I'm really tired today. - Hai I'm conflicting with you now again
+<<<<<<< HEAD
+- nu uh -hai conflict conflict conflict
+=======
+- etc etc etc.
rule of 3's
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#113 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AX3TI4HFDTbMdbfseHffI9OY0cGNwaegks5svkkFgaJpZM4QFCUj>
.
|
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
2 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.
donzo