Edinburgh’s Taxi Outing will now go ahead after discussions between organisers and police saw a reversal