I'd personally slap your buddy and make him re-edit at the proper framerate, or otherwise you could speedup and re-edit your part at his. I'm positive neither of you is lazy enough to compromise the smoothness of your AMV for a bit less of effort.
Or perhaps, if there is no transition between the tracks, but just hard cuts, you might want to give VFR timecodes a chance.
As a last resort, I'd convertfps(23.976) his footage... blending isn't nice, but it is smoother than random frame drop. See what looks better in motion (if you go for the frame drop, use zarxrax's suggestion, as that might give a somewhat smoother result than just changefps, even if only a little).