Add a license file #4
Closed
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
Should be OK on ruby-1.9.x too.
shinh
requested changes
Nov 25, 2017
| @@ -1,3 +1,8 @@ | |||
| #!/bin/sh | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
There're conflict markers :) Anyway, I think we don't need this commit anymore. It seems you've added in 2014, but I have also added it in 2016.
|
Hi!
On Sat, 25 Nov 2017 18:01:19 +0000 (UTC) Shinichiro Hamaji ***@***.***> wrote:
shinh requested changes on this pull request.
Other changes look great, could you remove the commit for rust?
> @@ -1,3 +1,8 @@
#!/bin/sh
+<<<<<<< HEAD
There're conflict markers :) Anyway, I think we don't need this commit
anymore. It seems you've added in 2014, but I have also added it in 2016.
I'll handle these requests yes.
…--
-----------------------------------------------------------------
Shlomi Fish http://www.shlomifish.org/
Best Introductory Programming Language - http://shlom.in/intro-lang
Electrical Engineering studies. In the Technion. Been there. Done that. Forgot
a lot. Remember too much.
— http://www.shlomifish.org/humour.html
Please reply to list if it's a mailing list post - http://shlom.in/reply .
|
|
Hmm... these seem like a git or github problem because my local repo clone is fine. I'll have to see. |
|
No worry. I've manually merged your PR, dropping the change for rust: d872b6a Thanks! |
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.