kkeithle pushed to nfs-ganesha (f22). "2.2.0-0.12rc-final"

[notifications at fedoraproject.org]

>From 1a20e8b0ec6e2d4aa75dd1a541c3d8d900116a89 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle at redhat.com>
Date: Mon, 20 Apr 2015 09:43:48 -0400
Subject: 2.2.0-0.12rc-final


diff --git a/sources b/sources
index 9218cc3..5873401 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-cdc55ae34d6c0a08add4f54cf7d4373a  nfs-ganesha-2.2.0rc8.tar.gz
-e46e22bf9b312a7e92684a177f1f46d7  ntirpc-1.2.1.tar.gz
-=======
 b52681780d9e6f571feee24270979c43  nfs-ganesha-2.2.0rc-final.tar.gz
->>>>>>> origin
+e46e22bf9b312a7e92684a177f1f46d7  ntirpc-1.2.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nfs-ganesha.git/commit/?h=f22&id=1a20e8b0ec6e2d4aa75dd1a541c3d8d900116a89