---
- branch: MAIN
  date: Sun Mar 24 15:15:09 UTC 2013
  files:
  - new: '1.5'
    old: '1.4'
    path: pkgsrc/editors/emacs24/Makefile.common
    pathrev: pkgsrc/editors/emacs24/Makefile.common@1.5
    type: modified
  id: 20130324T151509Z.0ba96bf6d58b96ce333e3c62f9ad5b317fad3125
  log: |
    Remove another wrong CONFLICTS. sigh
  module: pkgsrc
  subject: 'CVS commit: pkgsrc/editors/emacs24'
  unixtime: '1364138109'
  user: dholland