lang edits (careful merging w/upstream comments)#3
Closed
bumblefudge wants to merge 98 commits intokdenhartog:masterfrom
bumblefudge:master
Closed
lang edits (careful merging w/upstream comments)#3bumblefudge wants to merge 98 commits intokdenhartog:masterfrom bumblefudge:master
bumblefudge wants to merge 98 commits intokdenhartog:masterfrom
bumblefudge:master
Conversation
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
* Update eip-2612.md * Update eip-2612.md --------- Co-authored-by: zakrad <1@1.com>
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
Merged by EIP-Bot.
…Token` Merged by EIP-Bot.
Co-authored-by: Jan Turk <jan.turk12@gmail.com>
Merged by EIP-Bot.
…ith incorrect permissions (ethereum#7188)
* erc721lockable init * update discussion * update license * update readme * add eip header * update title * update readme * update readme * update readme * update readme * update eip number * update eip number * update eip number * update eip number * update eip number * update readme * update readme * update readme * update readme * error codes * added interface to specification * lint fixe * transfer with lock/approve * rename * readme update * optimize lock/unlock * readme with new functions * readme update * error codes * discussion link * tokenId * remove redundancy * updates test * updates doc * review fixes * overrides and interface correction * add locker to transferAndLock * remove locker * license * doc update * doc update * doc update * author updates --------- Co-authored-by: piyush.chittara <piyush.chittara@coindcx.com> Co-authored-by: Piyush <piyush@Suris-Macbook.local> Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com>
Co-authored-by: Pedro Gomes <pedrogomes94@gmail.com>
Owner
|
Yeah I've been trying to use feature branches. Can you do this PR against the |
|
The commit ebea035 (as a parent of 5781f3d) contains errors. |
Author
|
closed in leiu of #4 |
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
20 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.
I guess on the EIPs repo un-requested reviewers can't just request changes on any old line so I had to open a PR... but I think I was pulling against an older
masterbranch (maybe you've been accepting suggestions or pushing commits direct to your branch on ethereum/eips?), so this might be an exercise in chaos. i'll keep my local branch in case it's easier to just resubmit elsewhere/otherwise (i.e., just request my review over there if it saves you time!)