Snoop said that when they met just before Pac died, that he told Nas he's dissing him on Makaveli, and if Nas doesn't respond, then he'll stop coming at him. I don't know if that's considered "squashing" the beef. I don't even know whether or not Nas ever responded. I'm assuming not, since Pac died, but it didn't stop some people...
Wasnt there a story before all that.. that they had met and actually squashed it.. but then the next Nas album was released (Sorry wouldnt know, wasnt a Nas fan until recent times..) and Pac felt he was dissed on that.. Or something.. I personally wouldnt comment on that night, cause i wasnt there.. but considering how many stories have come out about the beef being squashed.. could it not just be said that pac may not have had beef with Nas.. but he didnt like him.. and Nas shouldnt have gone anywhere near the Thugs Mansion project
Pac approached Nas to let him know he didnt have beef with him over the East Vs West shit, then Nas released It Was Written and Pac felt there was a diss in there so it set Pac off. Then at the MTV Awards there was about to be some problems but Nas and Pac talked it out and Pac was gonna take off the disses, according to the Outlawz.