commit 35eab1a32bc6786a6ef6d1d98b6c003375f335f0 Merge: fb34043 18b41d9 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Nov 22 22:07:01 2023 +0000 Merge branch 'master' into f39 .gitignore | 6 ++++++ nvidia-modprobe.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) --- diff --cc .gitignore index b070872,65dc268..01814eb --- a/.gitignore +++ b/.gitignore @@@ -53,4 -53,6 +53,10 @@@ nvidia-modprobe-*.tar.g /nvidia-modprobe-495.44.tar.bz2 /nvidia-modprobe-535.104.05.tar.bz2 /nvidia-modprobe-535.113.01.tar.bz2 ++<<<<<<< HEAD +/nvidia-modprobe-535.129.03.tar.bz2 ++======= + /nvidia-modprobe-545.23.06.tar.bz2 + /nvidia-modprobe-545.29.02.tar.bz2 + /nvidia-modprobe-545.29.06.tar.bz2 ++>>>>>>> master