---
- branch: MAIN
  date: Fri May  3 09:56:50 UTC 2024
  files:
  - new: '1.3054'
    old: '1.3053'
    path: pkgsrc/doc/CHANGES-2024
    pathrev: pkgsrc/doc/CHANGES-2024@1.3054
    type: modified
  id: 20240503T095650Z.606e753f2cdc7ffe37c0333200c755ac3068bf0b
  log: |
    CHANGES-2024: resolve a conflict
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/doc'
  unixtime: '1714730210'
  user: pho