commit 8384cd1863533a82089b8fa30725b4d11c6b7baf Merge: cd68795 178f5b8 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Jun 28 18:43:38 2022 +0100 Merge master nvidia-modprobe.spec | 11 ++++++++++- sources | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- diff --cc sources index 39311a3,0a2642b..eef95f8 --- a/sources +++ b/sources @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD +SHA512 (nvidia-modprobe-510.68.02.tar.gz) = c2621d7125cc481b6850295c123ca354c9a37662c2611c1a52d6ee675a12bea619f64d7f3e12b52a7f36a4b8aa732b7e896734803ccbe9ecad3351df1d9768d8 ++======= + SHA512 (nvidia-modprobe-515.57.tar.gz) = d12d93d46519f0a5d4272da85a9fec26de56c54c2d858f56e3baa0d1165c475b160f9025ef14d70c0874618863a1e4b8942abb55ffefe832ec1c6f48709d2851 ++>>>>>>> master