[oxygen-icon-theme/f14/master] more merging

[Rex Dieter]

commit e853c2690f6473b769983fcf8f261eb8d67ef6ae
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 00:37:57 2010 -0500

    more merging

 .gitignore |    4 ----
 sources    |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a1fc0e4..92a0a51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-oxygen-icons-4.5.0.tar.bz2
-=======
 /oxygen-icons-4.5.1.tar.bz2
->>>>>>> master
diff --git a/sources b/sources
index b08355c..46254e0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f266c3aaafed30d108dd562bea9b2d0b  oxygen-icons-4.5.0.tar.bz2
-=======
 02aa5d1145378a686b1329dca02fc681  oxygen-icons-4.5.1.tar.bz2
->>>>>>> master