fix merge errors
authorSimon Marlow <simonmar@microsoft.com>
Wed, 31 Oct 2007 15:38:39 +0000 (15:38 +0000)
committerSimon Marlow <simonmar@microsoft.com>
Wed, 31 Oct 2007 15:38:39 +0000 (15:38 +0000)
commitbf4d6a58a1079b944ffc4bdd41d57403a7727046
treef457062d7896fca7d318979b416e7ea1c8d57724
parent56798c9137870dddb70074ef9e411e8e08eb68e8
fix merge errors
rts/sm/Evac.c
rts/sm/Evac.c-inc