fix conflict
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 14 Oct 2010 14:05:20 +0000 (16:05 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 14 Oct 2010 14:05:20 +0000 (16:05 +0200)
commitb92fb292f7e7240236a96061cb2630c51287d172
tree90ae608fcbb7e803ac71ae1350bb98fdbba87d61
parent6178c96c21820afccb8fbdfe6e5d21652fb24e3a
parent8f7d38fec50b8efb3abf7c35886f9362c80380ca
fix conflict
vsys-scripts.spec