[valide/f14/master] fix spec

[MERCIER Jonathan]

commit 93af16f2f074d35e5a2891b7725fc3b2ee6e9c75
Author: bioinfornatics <bioinfornatics at gmail.com>
Date:   Sat Sep 4 13:51:46 2010 +0200

    fix spec
    
    Conflicts:
    
    	valide.spec

 valide.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/valide.spec b/valide.spec
index 8b59905..8a68482 100644
--- a/valide.spec
+++ b/valide.spec
@@ -17,6 +17,10 @@ Group:          Development/Tools
 License:        GPLv3+
 URL:            http://www.valaide.org
 Source0:        %{name}-%{alphatag}%{svn_revision}.tar.xz
+<<<<<<< HEAD
+=======
+Source1:	    valadoc.py
+>>>>>>> 63ffbe9... fix spec
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= %{gtk2_version}