stuff

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@82 7f574dfc-610e-0410-a909-a81674777703

AUTHORS

@@ -1,3 +1,5 @@
+# $Id$
+
 Authors of conky in alphapetical order (please, send mail if I forgot
 somebody or email address / name is wrong):
 
@@ -39,22 +41,16 @@ Gwenhael LE MOINE <cycojesus at yahoo dot fr>
 Hannu Saransaari <hipo at users dot sourceforge dot net>
   Main code
 
-<<<<<<< AUTHORS
-<<<<<<< AUTHORS
 Jason Mitchell <jason.mitchell03 at saintleo dot edu>
   UTF8 fix
   Source clean up
 
-=======
-=======
-j-rock - #otw on freenode
-  small fix for XFT
+Joe Myre - <joemyre at users dot sourceforge dot net>
+  developer
 
->>>>>>> 1.4
 jack_mort - gentoo forums
   $tab patch
 
->>>>>>> 1.3
 Jarmo Hekkanen
   SETI stuff
 

ChangeLog

@@ -1,3 +1,5 @@
+# $Id$
+
 2005-08-07
 	* mpd password patch from Joshua Gerrish
 	* conky can run without X now, use --disable-x11 when configuring