This commit is contained in:
simono41 2018-05-03 17:10:06 +02:00
parent 78a0aeeb90
commit 1fc49df045

View file

@ -686,12 +686,9 @@ nfs-utils
nfsidmap nfsidmap
nilfs-utils nilfs-utils
nm-connection-editor nm-connection-editor
<<<<<<< HEAD
noto-fonts noto-fonts
noto-fonts-emoji noto-fonts-emoji
=======
nmap nmap
>>>>>>> 2b2c2fcfcf1a3693e8a601267b5a948f94001fae
npth npth
nspr nspr
nss nss