Module Name:	pkgsrc
Committed By:	jmmv
Date:		Thu Apr 24 20:46:37 UTC 2003

Modified Files:
	pkgsrc/chat/gaim: Makefile
	pkgsrc/chat/gaim-gtk1: Makefile

Log Message:
gaim-gtk1's package basename is the same as gaim's one; adjust CONFLICTS
accordingly.


To generate a diff of this commit:
cvs rdiff -r1.26 -r1.27 pkgsrc/chat/gaim/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/chat/gaim-gtk1/Makefile

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