[nvidia-kmod/el7] clean sources
commit 6786c4a5743951685fbfab35a2ac78e456482a0d
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 13:31:55 2017 +0000
clean sources
sources | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/sources b/sources
index 7f959aa..e69de29 100644
--- a/sources
+++ b/sources
@@ -1,4 +0,0 @@
-<<<<<<< HEAD
-7c9823a01dbbffca386a8e399997addc nvidia-kmod-data-331.113.tar.xz
-=======
->>>>>>> master