New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update for some 11.1 changes #56

Closed

flamendless wants to merge 1 commit into love2d-community:master from flamendless:master

flamendless commented Apr 30, 2018

No description provided.


          update for *some* 11.1 changes

9d19492

tst2005 commented May 2, 2018

There is something wrong in your indentation at https://github.com/flamendless/love-api/blob/9d194926311e8a64ccd96d61d61fa4843d049376/modules/filesystem/Filesystem.lua#L166-L168

Author

flamendless commented May 2, 2018

I believe it's because of my vim config.

Collaborator

rm-code commented May 2, 2018

I merged my branch for the 11.0 update just now.

@flamendless It would be cool if you could rebase against master again to get rid of any conflicts.

Author

flamendless commented May 2, 2018

@rm-code how? I havent done that before

Collaborator

rm-code commented May 4, 2018

@flamendless Here is a pretty good guide for rebasing: https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

Of course you can also just update by merging.

Author

flamendless commented May 4, 2018

Would my modified code be gone?

Collaborator

rm-code commented Jul 28, 2018

@flamendless It wouldn't be gone automatically. You have to manually fix the conflicts anyway.

Contributor

hahawoo commented Oct 25, 2019

Updated to 11.2, see #54

hahawoo closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet