`DS.Adapter.resolveMapConflict` can receive two arguments
Better YUIDocs
Merge pull request #890 from thomasboyt/docs

Better YUIDocs
Merge pull request #887 from tricknotes/remove-not-referenced-argument

`DS.Adapter.resolveMapConflict` can receive two arguments
Eliminate unused variables

I used jshint with '"unused": true' option.