[xorg-x11-drv-nvidia/f23: 16/16] fix merge
commit 7b1b3220ed470697e1ce7b59147370969d2a2907
Merge: 968ad10 601ebc3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 15 09:16:30 2016 +0100
fix merge
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 31 ++++++++++++++++++++-----------
3 files changed, 26 insertions(+), 14 deletions(-)
---