Closed felipedferreira closed 3 years ago
I dont know how to resolve the conflict. they both look identical to me. would someone please tell me how I can resolve this on github.
@UncleFifi You could pull the source branch and your IDE should show you the conflicts. It's not recommended to directly solve it on github.
@titivermeesch thanks for support. I believe I was able to resolve conflicts. would this be okay
Would you please accept my PR and label it hacktoberfest-accepted
I have made the changes you have requested, please see #63 for changes
hacktoberfest-Pull-Request Making it so the box shakes if its empty and cant be changed