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...