commit 12dec79cfb522110a67017f3fbb6d12b9a924dca Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Sep 30 07:07:33 2016 +0100 fix gitignore .gitignore | 6 ------ 1 file changed, 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 856372a..c9a0fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,9 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-367.35.run /NVIDIA-Linux-x86-367.35.run /NVIDIA-Linux-x86_64-367.35.run -<<<<<<< HEAD -/NVIDIA-Linux-x86-367.44.run -/NVIDIA-Linux-x86_64-367.44.run -/NVIDIA-Linux-armv7l-gnueabihf-367.44.run -======= /NVIDIA-Linux-armv7l-gnueabihf-370.23.run /NVIDIA-Linux-x86-370.23.run /NVIDIA-Linux-x86_64-370.23.run /NVIDIA-Linux-armv7l-gnueabihf-370.28.run /NVIDIA-Linux-x86-370.28.run /NVIDIA-Linux-x86_64-370.28.run ->>>>>>> master