commit | a969437645550a8f7595ba017c7658c4341d77d1 | [log] [download] |
---|---|---|
author | Damien Miller <djm@mindrot.org> | Wed Jan 04 07:27:50 2006 +1100 |
committer | Damien Miller <djm@mindrot.org> | Wed Jan 04 07:27:50 2006 +1100 |
tree | 0e4dbb41d6d60114019bf4bc08b8d8803ffcc097 | |
parent | b797770da28c07a10b51528f79af3bacae2ff613 [diff] |
- (djm) [channels.c] clean up harmless merge error, from reyk@