diff options
| author | Paul Eggert | 2020-01-01 00:19:43 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 00:59:52 +0000 |
| commit | 365e01cc9f64ce6ca947ccfd8612d60763280a37 (patch) | |
| tree | ffecd1ba3f6259e00657d28ee6d01239f3afacc8 /admin/gitmerge.el | |
| parent | cd2c1561636597c67edbf3daf10388e5385a93fc (diff) | |
| download | emacs-365e01cc9f64ce6ca947ccfd8612d60763280a37.tar.gz emacs-365e01cc9f64ce6ca947ccfd8612d60763280a37.zip | |
Update copyright year to 2020
Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
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 edf43797304..eeef4e3fc59 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-2019 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2010-2020 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> |