The fiery fight between the makers of a popular hot sauce and a small Southern California city is apparently over.