Module Name:	pkgsrc
Committed By:	sakamoto
Date:		Mon Dec 20 05:28:51 UTC 1999

Modified Files:
	pkgsrc/misc/jitterbug: Makefile

Log Message:
Eliminate "<<<<<<< Makefile", "=======", ">>>>>>> 1.5" and old block.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/misc/jitterbug/Makefile

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