search

Robmaister / SharpNav

Advanced Pathfinding for C#
sharpnav.com
Other
537 stars 129 forks source link

Some meaninglessly named commits for resolving conflicts #33

Closed ab9x3jhx6a closed 9 years ago

Robmaister commented 9 years ago

There are a few merge conflicts that you committed into the repository that need to be resolved. You should have also rebased over my changes instead of merging, since the PR looks like you added 25k lines.

You also don't need to commit an entire copy of YamlDotNet.

I can help you with these things offline.