CVS commit: pkgsrc/editors

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Feb 24 01:25:31 UTC 2013

Modified Files:
        pkgsrc/editors/emacs22: Makefile Makefile.common
        pkgsrc/editors/emacs22-nox11: Makefile

Log Message:
Remove some more wrong CONFLICTS.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/emacs22/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs22/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/emacs22-nox11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.