fix gitignore

8 years ago · 12dec79cfb
parent 7ed2449273
commit 12dec79cfb
1 changed files with 0 additions and 6 deletions
--- 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