remove some conflict indicators.
[platform/upstream/atk.git] / docs / atk.types