diff options
| author | Paul Eggert | 2018-01-01 00:21:42 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-01-01 00:57:59 -0800 |
| commit | 5c7dd8a783fa2503f042f6671279e5fca38c35cb (patch) | |
| tree | 5cdd7dbd45722f66524ec6956d90e99ae3ae4c34 /admin/gitmerge.el | |
| parent | 220a9ecba1b62e09703cb0a3c122797d4498ccc2 (diff) | |
| download | emacs-5c7dd8a783fa2503f042f6671279e5fca38c35cb.tar.gz emacs-5c7dd8a783fa2503f042f6671279e5fca38c35cb.zip | |
Update copyright year to 2018
Run admin/update-copyright.
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 9ea94b71e0f..1058088cce9 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; gitmerge.el --- help merge one Emacs branch into another | 1 | ;;; gitmerge.el --- help merge one Emacs branch into another |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2010-2017 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2018 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: David Engster <deng@randomsample.de> | 5 | ;; Authors: David Engster <deng@randomsample.de> |
| 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> | 6 | ;; Stefan Monnier <monnier@iro.umontreal.ca> |