resolve conflict manually
[sfa.git] / sfa / methods / GetGids.py
2010-08-06 Tony MackReplacing get_gids with GetGids
2010-08-06 Tony Mackreplaceing resolve with Resolve