remove some conflict indicators.
[platform/upstream/atk.git] / docs /
drwxr-xr-x   ..
-rw-r--r-- 144 .cvsignore
-rw-r--r-- 4381 Makefile.am
-rw-r--r-- 1997 atk-docs.sgml
-rw-r--r-- 103 atk-overrides.txt
-rw-r--r-- 11013 atk-sections.txt
-rw-r--r-- 0 atk.types
drwxr-xr-x - tmpl