Merge from gnulib and try to repair bad merge

[gnu-emacs] / lib / close-stream.c

diff --git a/lib/close-stream.c b/lib/close-stream.c
index d6a869287e360fa87ad70d440cc7f0946f896f78..6e3d8658d580e7a179b58ca4e85ae8c30c94ba07 100644 (file)
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -1,6 +1,6 @@
 /* Close a stream, with nicer error checking than fclose's.
 
-   Copyright (C) 1998-2002, 2004, 2006-2013 Free Software Foundation, Inc.
+   Copyright (C) 1998-2002, 2004, 2006-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by