commit 7ed2449273c2701c88ae17e56a2b0468a628119d Merge: fd75400 0890182 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Sep 30 07:05:05 2016 +0100 fix merge .gitignore | 9 +++++++++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 31 +++++++++++++++++++++++-------- 3 files changed, 35 insertions(+), 11 deletions(-) --- diff --cc .gitignore index 3cbf3a0,c9a0fbf..856372a --- a/.gitignore +++ b/.gitignore @@@ -4,6 -4,9 +4,15 @@@ NVIDIA-Linux-x86_64-358.16.ru /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