From fd1bb61715a7a4c169b89d10c32d3501b2af8a12 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 13 Aug 2008 14:28:22 +0000 Subject: [PATCH] get rid of <<<< cvs spew --- gdm.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gdm.spec b/gdm.spec index cde4964..5bfcd4a 100644 --- a/gdm.spec +++ b/gdm.spec @@ -327,7 +327,6 @@ fi * Thu Jul 10 2008 Matthias Clasen - 1:2.22.0-10 - Improve rendering of languages ->>>>>>> 1.402 * Thu Jul 3 2008 Jon McCann - 1:2.22.0-9 - Check for a null filesystem type