[valide/f14/master] New Revision

[MERCIER Jonathan]

commit 433cbe4a91a67208435c8585f65b894138510eb3
Author: bioinfornatics <bioinfornatics at fedoraproject.org>
Date:   Fri Oct 8 22:58:25 2010 +0200

    New Revision

 sources     |    4 ++++
 valide.spec |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/sources b/sources
index 53ccb86..62b7875 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 3693e1dc1db5e1c53975e61190adab98  valide-20100904svn689.tar.xz
+=======
+2ca942fa38b57175121333d350773ddd  valide-20100923bzr557.tar.xz
+>>>>>>> d3533ce... New Revision
 b7e2a245a559bb4a841f593f6b80f11e  valadoc.py
diff --git a/valide.spec b/valide.spec
index 86b2e92..ff62675 100644
--- a/valide.spec
+++ b/valide.spec
@@ -10,7 +10,11 @@
 
 Name:           valide
 Version:        0.7.0
+<<<<<<< HEAD
 Release:        5.%{alphatag}%{svn_revision}%{?dist}
+=======
+Release:        7.%{alphatag}%{svn_revision}%{?dist}
+>>>>>>> d3533ce... New Revision
 Summary:        An integrated development environment (IDE) for the Vala programming language
 
 Group:          Development/Tools
@@ -127,6 +131,9 @@ fi
 %{_libdir}/libvalide-*.so
 
 %changelog
+* Fri Oct 08 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.7.0-8.20100923bzr557
+- Fix spec
+
 * Sat Sep 04 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.7.0-5.20100904svn689
 - Update to last revision (689)