1<<<<<<< conflict3.txt 2root:someone@example.com 3||||||| conflict1.txt 4# root: me@my.domain 5======= 6#root:me@my.domain 7>>>>>>> conflict2.txt 8 9<<<<<<< conflict3.txt 10#Basicsystemaliases--theseMUSTbepresent 11MAILER-DAEMON:postmaster 12postmaster:root 13||||||| conflict1.txt 14# Basic system aliases -- these MUST be present 15MAILER-DAEMON: postmaster 16postmaster: root 17======= 18#Basicsystemaliases--theseMUSTbepresent 19MAILER-DAEMON:postmaster 20postmaster:root 21 22#Generalredirectionsforpseudoaccounts 23_dhcp:root 24_pflogd:root 25>>>>>>> conflict2.txt 26