remove some conflict indicators.
[platform/upstream/atk.git] / docs / .cvsignore
2001-06-07 Owen Tayloradd cvsignores