[src/trunk]: src/sys/external/bsd/drm2/nouveau Fix merge botch

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bfe213fb9f2c
branches:  trunk
changeset: 996277:bfe213fb9f2c
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Jan 27 05:03:57 2019 +0000

description:
Fix merge botch

diffstat:

 sys/external/bsd/drm2/nouveau/files.nouveau |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (11 lines):

diff -r e9b115075e62 -r bfe213fb9f2c sys/external/bsd/drm2/nouveau/files.nouveau
--- a/sys/external/bsd/drm2/nouveau/files.nouveau       Sun Jan 27 05:00:48 2019 +0000
+++ b/sys/external/bsd/drm2/nouveau/files.nouveau       Sun Jan 27 05:03:57 2019 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: files.nouveau,v 1.24 2019/01/27 02:08:43 pgoyette Exp $
-
-version        20180827
+#      $NetBSD: files.nouveau,v 1.25 2019/01/27 05:03:57 kre Exp $
 
 version        20180827