Разрешение конфликта общего файла

app-i18n/man-pages-it-5.06 (/usr/share/man/it/man5/passwd.5.bz2)
sys-apps/shadow-4.8.1-r4 (/usr/share/man/it/man5/passwd.5.bz2)
mhiretskiy 2554
parent 294235d209
commit 786f5423f3

@ -135,6 +135,7 @@
~app-i18n/ibus-pinyin-1.5.0 amd64
~app-i18n/ibus-table-chinese-1.8.3 amd64
~app-i18n/librime-1.7.3 amd64
~app-i18n/man-pages-l10n-4.10.0 amd64
~app-i18n/scim-1.4.18 amd64
~app-i18n/sunpinyin-data-20130220 amd64
~app-i18n/tegaki-zinnia-japanese-0.3 amd64
@ -602,6 +603,7 @@ net-vpn/wireguard-tools amd64
~sys-apps/apparmor-utils-3.0.1 amd64
~sys-apps/fix-gnustack-0.1 amd64
~sys-apps/hwloc-2.3.0 amd64
~sys-apps/man-pages-5.12 amd64
~sys-apps/miscfiles-1.5 amd64
~sys-apps/s6-2.6.1.1 amd64
~sys-apps/s6-portable-utils-2.2.1.1 amd64

@ -0,0 +1,5 @@
# Calculate format=contents ini(overlay-calculate.revision)=>20191116.3,#-cut(0,-,#-cl_pass_file-#)-#
#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-#
!app-i18n/man-pages-it /usr/share/man/it/man5/passwd.5.bz2
!app-i18n/man-pages-ru /usr/share/man/ru/man5/passwd.5.bz2
Loading…
Cancel
Save