fix merge problem
authorsmbaker <smbaker@fc8clean.lan>
Tue, 8 Nov 2011 03:13:04 +0000 (19:13 -0800)
committersmbaker <smbaker@fc8clean.lan>
Tue, 8 Nov 2011 03:13:04 +0000 (19:13 -0800)
commit44dbc99733c218930dc61619c068f1038c4f33e4
tree0feda5c926f5752f706f4577c2613cf210087178
parentc366209a32b65531b813e9d8e406b69c6e2b35cb
parenta3996bfa45298c8d0abfd58916221abba737441c
fix merge problem
sfa/managers/slice_manager.py