A long-running dispute at Cambodian clothing factory SL Garment, which resulted in the death of one person after violent clashes broke out between workers and armed forces, has been settled.