raveit65 pushed to mate-themes (f22). "fix merge conflict"

[notifications at fedoraproject.org]

From a2c8351a943d47994f01a61863ac7a9d206912e8 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Wed, 10 Jun 2015 11:46:10 +0200
Subject: fix merge conflict


diff --git a/.gitignore b/.gitignore
index a070cca..6e4baa7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,4 @@
 /mate-themes-gtk3.16-1.10.1-git20150506-d80f9d7.tar.xz
 /mate-themes-gtk3.16-1.10.1-git20150530-a0a9b98.tar.xz
 /mate-themes-gtk3.16-1.10.1-git20150531-94e1587.tar.xz
-<<<<<<< HEAD
-=======
 /mate-themes-gtk3.16-1.10.1.tar.xz
->>>>>>> master
diff --git a/sources b/sources
index d288182..9744a5d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e22bdd0189008bd4a1b67a541fffa5a1  mate-themes-gtk3.16-1.10.1-git20150531-94e1587.tar.xz
-=======
 93f5a0af8f90c242eeabdc8586342ed2  mate-themes-gtk3.16-1.10.1.tar.xz
->>>>>>> master
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mate-themes.git/commit/?h=f22&id=a2c8351a943d47994f01a61863ac7a9d206912e8