search

rubensayshi / gw2spidy

GW2Spidy - Guild Wars 2 Tradingpost Graphs
http://www.gw2spidy.com
231 stars 86 forks source link

Merge conflict duplicate line of code #106

Closed mercutiodesign closed 11 years ago

mercutiodesign commented 11 years ago

Looks like there was a little merge conflict with my PRs so you have a duplicate line of code in your helpers.

rubensayshi commented 11 years ago

hmm okay

PS. can you see if it's possible to have your editor use 4 spaces instead of tabs btw for the gw2spidy project, it makes merging cleaner :-) if it's to much of a hassle because you use tabs for all your other stuff then it's fine to ;-)