Mercurial > emacs
diff nt/inc/sys/socket.h @ 28855:1be9a502caca
Cleaned some left over bogus conflict markers.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 10 May 2000 21:37:06 +0000 |
parents | cfbf43d0fd54 |
children | 65f455b1ab20 |