Skip to content

Revert to previous merge method#496

Merged
JordanMartinez merged 1 commit intoFXMisc:masterfrom
JordanMartinez:fixUndo
Apr 29, 2017
Merged

Revert to previous merge method#496
JordanMartinez merged 1 commit intoFXMisc:masterfrom
JordanMartinez:fixUndo

Conversation

@JordanMartinez
Copy link
Copy Markdown
Contributor

@JordanMartinez JordanMartinez commented Apr 28, 2017

Reverts back to the previous merge method

@TomasMikula
Copy link
Copy Markdown
Member

The type param on UndoActions should not be necessary.

@JordanMartinez
Copy link
Copy Markdown
Contributor Author

As said in my other comment, should the TextChange class-to-interface conversion be done at all? If it should, I feel like it should be in its own PR that does a lot of other refactoring.

@TomasMikula
Copy link
Copy Markdown
Member

Yeah, not in this PR. Not sure what it gives us anyway.

@JordanMartinez
Copy link
Copy Markdown
Contributor Author

Not really anything. It was only necessary because of my error in adding a type param to UndoActions

I'll fix this tomorrow.

@JordanMartinez JordanMartinez changed the title Revert to previous merge method; add type param to UndoActions Revert to previous merge method Apr 29, 2017
@JordanMartinez
Copy link
Copy Markdown
Contributor Author

Ok. Only the revert is in this PR now.

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