1<<<<<<< conflict3.txt 2root:someone@example.com 3======= 4#root:me@my.domain 5>>>>>>> conflict2.txt 6 7<<<<<<< conflict3.txt 8#Basicsystemaliases--theseMUSTbepresent 9MAILER-DAEMON:postmaster 10postmaster:root 11======= 12#Basicsystemaliases--theseMUSTbepresent 13MAILER-DAEMON:postmaster 14postmaster:root 15 16#Generalredirectionsforpseudoaccounts 17_dhcp:root 18_pflogd:root 19>>>>>>> conflict2.txt 20