[zarafa] Upgrade to 7.0.2 (#717968)

[Robert Scheck]

commit 6ee8c0a5afb58834752602d9d82a9f7f23b769bd
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 1 12:57:09 2011 +0200

    Upgrade to 7.0.2 (#717968)

 zarafa.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/zarafa.spec b/zarafa.spec
index a1e23c6..93c8d75 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -1,13 +1,7 @@
 %global beta_or_rc      0
-<<<<<<< HEAD
 %global actual_release  1
 %global svnrevision     29470
 %global with_clucene    1
-=======
-%global actual_release  2
-%global svnrevision     28479
-%global with_clucene    0
->>>>>>> b7e65a1021153fb2216cf1b1cc0d3a1c7e0151f3
 %global with_ldap       1
 %global with_xmlto      1
 %global no_multiupload  1