---
- branch: MAIN
  date: Fri Feb 11 09:29:59 UTC 2022
  files:
  - new: '1.691'
    old: '1.690'
    path: pkgsrc/doc/CHANGES-2022
    pathrev: pkgsrc/doc/CHANGES-2022@1.691
    type: modified
  id: 20220211T092959Z.536422fd3008fdb8c83a69af354ed509f0c27c99
  log: "Resolve a conflict\n"
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/doc'
  unixtime: '1644571799'
  user: pho