get rid of <<<< cvs spew

This commit is contained in:
Ray Strode 2008-08-13 14:28:22 +00:00
parent 2a2f8b736f
commit fd1bb61715

View File

@ -327,7 +327,6 @@ fi
* Thu Jul 10 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.22.0-10
- Improve rendering of languages
>>>>>>> 1.402
* Thu Jul 3 2008 Jon McCann <jmccann@redhat.com> - 1:2.22.0-9
- Check for a null filesystem type