Conflict resolved.
[platform/upstream/rpm.git] / db / xa /
drwxr-xr-x   ..
-rw-r--r-- 16213 xa.c
-rw-r--r-- 3763 xa_db.c
-rw-r--r-- 3773 xa_map.c