From 72f0b377f45b96e1c755ca6b52d0cba13a85a4ae Mon Sep 17 00:00:00 2001
From: "Marcel Kapfer (mmk2410)" <marcelmichaelkapfer@yahoo.co.nz>
Date: Mon, 5 Dec 2016 22:11:04 +0100
Subject: [PATCH] Merged emacs file

---
 atom/config.cson | 2 +-
 emacs.el         | 6 +++---
 hyper.js         | 2 +-
 mmk2410          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/atom/config.cson b/atom/config.cson
index c73bb59..ab47e5a 100644
--- a/atom/config.cson
+++ b/atom/config.cson
@@ -6,7 +6,7 @@
   _dartlang:
     _errorsInitialized: true
     _firstRun: true
-    _version: "0.6.32"
+    _version: "0.6.33"
   _flutterAnalytics:
     clientId: "5513e60a-abb3-4f83-ac72-3a9c0dd26c5c"
     optIn: true
diff --git a/emacs.el b/emacs.el
index c7172ff..2cc51d8 100644
--- a/emacs.el
+++ b/emacs.el
@@ -64,12 +64,12 @@
  '(custom-enabled-themes (quote (atom-one-dark)))
  '(custom-safe-themes
    (quote
-    ("1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
- '(send-mail-function (quote smtpmail-send-it))
+    ("6254372d3ffe543979f21c4a4179cd819b808e5dd0f1787e2a2a647f5759c1d1" "1160f5fc215738551fce39a67b2bcf312ed07ef3568d15d53c87baa4fd1f4d4e" default)))
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-    (stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme))))
+    (stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
+ '(send-mail-function (quote smtpmail-send-it)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/hyper.js b/hyper.js
index 76eff99..dd52c3a 100644
--- a/hyper.js
+++ b/hyper.js
@@ -4,7 +4,7 @@ module.exports = {
     fontSize: 14,
 
     // font family with optional fallbacks
-    fontFamily: 'Hermit, Menlo, "DejaVu Sans Mono", "Lucida Console", monospace',
+    fontFamily: 'Hermit, "DejaVu Sans Mono", "Lucida Console", monospace',
 
     // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk)
     cursorColor: 'rgba(248,28,229,0.8)',
diff --git a/mmk2410 b/mmk2410
index ba62303..4c91c6a 100755
--- a/mmk2410
+++ b/mmk2410
@@ -4,7 +4,7 @@ echo """
  Marcel Kapfer (mmk2410)
  aka Wilson O'Sullivan
 
- Programmer, Composer, Blogger
+ Designer, Composer, Programmer
 
  marcel-kapfer.de / mmk2410.org
  Twitter:    @mmk2410