fix merge conflicts
[sface.git] / sface / __init__.py
1