[metacity/f14/master: 2/3] 2.30.3

[Matthias Clasen]

commit 5f44a2c816c7718b8045b8c8d2d7ea1f340f91eb
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Sep 30 08:07:35 2010 -0400

    2.30.3

 .gitignore |    3 ---
 sources    |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86cc468..8d17d3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 metacity-2.30.0.tar.bz2
-<<<<<<< HEAD
-=======
 /metacity-2.30.2.tar.bz2
 /metacity-2.30.3.tar.bz2
->>>>>>> 028565e... 2.30.3
diff --git a/sources b/sources
index 3b9ba69..5f72a10 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-7c8a4c8f3b667efcc60f286adb445d4c  metacity-2.30.0.tar.bz2
-=======
 553784f376d96b902e19ff437cd5b339  metacity-2.30.3.tar.bz2
->>>>>>> 028565e... 2.30.3