[derelict] rebase branc

[MERCIER Jonathan]

commit 988d7f765a58d30f02006fd8db789c10ec1413b3
Author: bioinfornatics <bioinfornatics at fedoraproject.org>
Date:   Sun Feb 1 12:21:00 2015 +0100

    rebase branc

 derelict.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/derelict.spec b/derelict.spec
index 28496a1..ce05348 100644
--- a/derelict.spec
+++ b/derelict.spec
@@ -139,10 +139,6 @@ popd                                                                          \
 Name:           derelict
 Version:        3
 Release:        31.%{Util_alphatag}%{?dist}
-<<<<<<< HEAD
-=======
-
->>>>>>> fix spec
 Summary:        Collection of D bindings to C shared libraries
 Summary(fr):    Collection de bibliothèque en D interfaçant des bibliothèques dynamiques en C