Merge from origin/emacs-25

[gnu-emacs] / src / intervals.h

diff --git a/src/intervals.h b/src/intervals.h
index 96e82055e9ce62cd2ac582e657e7172fc80d0e61..b8cdcfdc0f5e9dbd7ae4aecf1c3d29a8a2fed8e2 100644 (file)
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -1,12 +1,12 @@
 /* Definitions and global variables for intervals.
-   Copyright (C) 1993-1994, 2000-2015 Free Software Foundation, Inc.
+   Copyright (C) 1993-1994, 2000-2016 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of