fix conflict
[platform/upstream/libsolv.git] / package /
drwxr-xr-x   ..
-rw-r--r-- 28589 libsatsolver.changes
-rw-r--r-- 5643 libsatsolver.spec.in