NCAA satisfied with North Carolina 'bathroom bill' replacement

But the group warned that discrimination will not be tolerated.