L’Oreal says has resolved Singles Day shopping spat