1*284a0aa9SBaptiste Daroussin<<<<<<< conflict3.txt 2*284a0aa9SBaptiste Daroussinroot:someone@example.com 3*284a0aa9SBaptiste Daroussin======= 4*284a0aa9SBaptiste Daroussin#root:me@my.domain 5*284a0aa9SBaptiste Daroussin>>>>>>> conflict2.txt 6*284a0aa9SBaptiste Daroussin 7*284a0aa9SBaptiste Daroussin<<<<<<< conflict3.txt 8*284a0aa9SBaptiste Daroussin#Basicsystemaliases--theseMUSTbepresent 9*284a0aa9SBaptiste DaroussinMAILER-DAEMON:postmaster 10*284a0aa9SBaptiste Daroussinpostmaster:root 11*284a0aa9SBaptiste Daroussin======= 12*284a0aa9SBaptiste Daroussin#Basicsystemaliases--theseMUSTbepresent 13*284a0aa9SBaptiste DaroussinMAILER-DAEMON:postmaster 14*284a0aa9SBaptiste Daroussinpostmaster:root 15*284a0aa9SBaptiste Daroussin 16*284a0aa9SBaptiste Daroussin#Generalredirectionsforpseudoaccounts 17*284a0aa9SBaptiste Daroussin_dhcp:root 18*284a0aa9SBaptiste Daroussin_pflogd:root 19*284a0aa9SBaptiste Daroussin>>>>>>> conflict2.txt 20