Closed itslewiswatson closed 9 years ago
Looks like your fork is ahead of ours currently but I'm just as confused as you are, I suppose we have a conflict in our branches or something but it is however possible to merge and the changes are supposed to be merged anyway, I do not recognize the changes in player-blips however but it looks mostly like formatting changes.
I think it's time to define some formatting guidelines for this project however, as I don't see any point in developers changing to their own preferences back and forth.
I'm not sure why the commit where I updated my fork is in here.