diff options
author | Sean Allred <code@seanallred.com> | 2015-01-04 14:07:40 -0500 |
---|---|---|
committer | Sean Allred <code@seanallred.com> | 2015-01-04 14:07:40 -0500 |
commit | 01df71244d3fe5412e2420127dcd2282d9fa39c7 (patch) | |
tree | 0fe936bfa609ea19c454cdcb4d1c2349d5c0c746 /sx-time.el | |
parent | 59327f6f9c6ba419543c47670a62af0aa41271ca (diff) | |
parent | 89834aa61adf1fff29379c82ab96629f0b2960d0 (diff) |
Merge branch 'master' into filter-macro
Conflicts:
sx-filter.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 |