mesa: Changes to 'ubuntu'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 debian/changelog |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 04bb436c13e78c0b5416c251cc2b4219ff8c8b8c
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Fri Jun 12 08:02:41 2009 +0300

    fix the changelog

diff --git a/debian/changelog b/debian/changelog
index d38b6d7..6acc2e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,7 +62,6 @@ mesa (7.4-1) experimental; urgency=low
   * New upstream release.
 
  -- Julien Cristau <jcristau@debian.org>  Wed, 01 Apr 2009 20:25:00 +0200
->>>>>>> 18cf88a563302751ed8cae4506913bddbd9fe298:debian/changelog
 
 mesa (7.4-0ubuntu4) karmic; urgency=low