clean merge conflict
[themes.git] / LCARStrek / mozapps / xpinstall /
drwxr-xr-x   ..
-rw-r--r-- 1145 xpinstallConfirm.css
-rw-r--r-- 263 xpinstallItemGeneric.png