rpms/wl-kmod/devel wl-kmod.spec,1.109,1.110

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14037

Modified Files:
	wl-kmod.spec 
Log Message:
Fixup



Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- wl-kmod.spec	30 Mar 2015 13:37:26 -0000	1.109
+++ wl-kmod.spec	30 Mar 2015 13:38:37 -0000	1.110
@@ -102,18 +102,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com>
+* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-7.4
 - Rebuilt for kernel
 
-<<<<<<< wl-kmod.spec
-* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-7.3
-- Rebuilt for kernel
-
-=======
-* Fri Mar 27 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-7.3
-- Rebuilt for kernel
-
->>>>>>> 1.108
 * Wed Mar 25 2015 Nicolas Chauvet <kwizart at gmail.com> - 6.30.223.248-7.2
 - Rebuilt for current