remove some conflict indicators.
[platform/upstream/atk.git] / docs / atk.types
2001-11-21 Owen TaylorVersions 0.0.8, interface, binary age 0. Fix trailing...