search

love2d-community / love-api

The whole LÖVE wiki in a Lua table.
http://love2d-community.github.io/love-api/
300 stars 48 forks source link

update for *some* 11.1 changes #56

Closed flamendless closed 5 years ago

tst2005 commented 6 years ago

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

flamendless commented 6 years ago

I believe it's because of my vim config.

rm-code commented 6 years ago

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.

flamendless commented 6 years ago

@rm-code how? I havent done that before

rm-code commented 6 years ago

@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.

flamendless commented 6 years ago

Would my modified code be gone?

rm-code commented 6 years ago

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

hahawoo commented 5 years ago

Updated to 11.2, see #54