---
- branch: MAIN
  date: Sun May 30 07:05:03 UTC 2021
  files:
  - new: '1.3056'
    old: '1.3055'
    path: pkgsrc/doc/CHANGES-2021
    pathrev: pkgsrc/doc/CHANGES-2021@1.3056
    type: modified
  id: 20210530T070503Z.d07215aea5d6829cd442995198ecab3980123293
  log: |
    (doc/CHANGES-2021) Fix CONFLICT, sorry
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/doc'
  unixtime: '1622358303'
  user: mef