---
- branch: MAIN
  date: Tue May 15 22:26:19 UTC 2018
  files:
  - new: '1.2400'
    old: '1.2399'
    path: pkgsrc/doc/CHANGES-2018
    pathrev: pkgsrc/doc/CHANGES-2018@1.2400
    type: modified
  id: 20180515T222619Z.803daa7bff547d8fe55b46fdada8ca9eaafa946b
  log: "Fix conflict.\n"
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/doc'
  unixtime: '1526423179'
  user: youri