rpms/nvidia-304xx-kmod/devel nvidia-304xx-kmod.spec,1.37,1.38

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14235

Modified Files:
	nvidia-304xx-kmod.spec 
Log Message:
Fixup



Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/devel/nvidia-304xx-kmod.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- nvidia-304xx-kmod.spec	30 Mar 2015 13:37:05 -0000	1.37
+++ nvidia-304xx-kmod.spec	30 Mar 2015 13:40:29 -0000	1.38
@@ -85,18 +85,12 @@
 
 
 %changelog
-* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com>
+* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 304.125-3.3
 - Rebuilt for kernel
 
-<<<<<<< nvidia-304xx-kmod.spec
-* Mon Mar 30 2015 Nicolas Chauvet <kwizart at gmail.com> - 304.125-3.2
-- Rebuilt for kernel
-
-=======
 * Fri Mar 27 2015 Nicolas Chauvet <kwizart at gmail.com> - 304.125-3.2
 - Rebuilt for kernel
 
->>>>>>> 1.36
 * Mon Mar 23 2015 Nicolas Chauvet <kwizart at gmail.com> - 304.125-3.1
 - Rebuilt for kernel