diff options
| author | Sean Allred <code@seanallred.com> | 2015-01-04 16:23:34 -0500 |
|---|---|---|
| committer | Sean Allred <code@seanallred.com> | 2015-01-04 16:23:34 -0500 |
| commit | 671053bf0824197fefe742ed9dd98c1b9a06565a (patch) | |
| tree | 3f457adffd80d7c180b52e936cef3698b067f28b /sx-time.el | |
| parent | 3b275a93789a568d23ece65086ffebb8de430f3a (diff) | |
| parent | 3c05aae9915976e749591600f6e8f59cbccef1a4 (diff) | |
Merge branch 'master' into more-tests
Conflicts:
Makefile
test/tests.el
Diffstat (limited to 'sx-time.el')
| -rw-r--r-- | sx-time.el | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,4 +1,4 @@ -;;; sx-time.el --- time +;;; sx-time.el --- time -*- lexical-binding: t; -*- ;; Copyright (C) 2014 Sean Allred |