diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 15:51:28 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-02 16:05:03 +0100 |
| commit | de3842a14e36b2debb3ad375d95411d15d45dc84 (patch) | |
| tree | 86ae571f85c639c616cf8939cbcec7f1c1be4c9c /.dir-locals.el | |
| parent | 646756675566a0907edf143c6b6950e0479d9e7e (diff) | |
| parent | cbf177e09af6b9d240388d148b0cb5e3488d8b09 (diff) | |
Imported recent work on Maneage, minor conflicts fixed
A few minor conflicts occurred and were fixed.
Diffstat (limited to '.dir-locals.el')
| -rw-r--r-- | .dir-locals.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.dir-locals.el b/.dir-locals.el index 8c3e759..dae2993 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -9,8 +9,8 @@ ;; ;; For more information see (info "(emacs) Directory Variables") ;; -;; Copyright (C) 2017 Mosè Giordano <mose@gnu.org> -;; Copyright (C) 2018-2019 Mohammad Akhlaghi <mohammad@akhlaghi.org> +;; Copyright (C) 2017-2020 Mosè Giordano <mose@gnu.org> +;; Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org> ;; ;; Copying and distribution of this file, with or without modification, ;; are permitted in any medium without royalty provided the copyright |