mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-11-07 12:48:33 -10:00
20 lines
374 B
Plaintext
20 lines
374 B
Plaintext
<<<<<<< conflict3.txt
|
|
root:[email protected]
|
|
=======
|
|
#root:[email protected]
|
|
>>>>>>> conflict2.txt
|
|
|
|
<<<<<<< conflict3.txt
|
|
#Basicsystemaliases--theseMUSTbepresent
|
|
MAILER-DAEMON:postmaster
|
|
postmaster:root
|
|
=======
|
|
#Basicsystemaliases--theseMUSTbepresent
|
|
MAILER-DAEMON:postmaster
|
|
postmaster:root
|
|
|
|
#Generalredirectionsforpseudoaccounts
|
|
_dhcp:root
|
|
_pflogd:root
|
|
>>>>>>> conflict2.txt
|