Merge from gnulib and try to repair bad merge

[gnu-emacs] / lib / fdatasync.c

diff --git a/lib/fdatasync.c b/lib/fdatasync.c
index 8f9bf15a52724c0c807aeeb44e3fe7742010e54b..bbc30396f52569fdc99c8252927ebff99e41975c 100644 (file)
--- a/lib/fdatasync.c
+++ b/lib/fdatasync.c
@@ -1,6 +1,6 @@
 /* Emulate fdatasync on platforms that lack it.
 
-   Copyright (C) 2011-2013 Free Software Foundation, Inc.
+   Copyright (C) 2011-2015 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public