From 84f47bdca7558a4dfe935917b7cf7471b9af864b Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Thu, 16 Aug 2018 20:19:16 -0500
Subject: merge

---
 init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index 116100b..c52c84f 100644
--- a/init.el
+++ b/init.el
@@ -135,7 +135,7 @@
 (exec-path-from-shell-initialize)
 (eshell)
 (add-hook 'eshell-mode-hook (lambda () (setenv "TERM" "emacs")))
-
+(setq tramp-default-method "ssh")
 
 ;;; ido / smex / completion
 (setq-default
@@ -205,7 +205,7 @@
 
 ;;; markdown-mode
 (add-hook 'markdown-mode-hook 'flyspell-mode)
-(setq-default markdown-command "pandoc -f markdown_github")
+(setq-default markdown-command "pandoc -f gfm")
 
 
 ;;; html-mode
-- 
cgit v1.2.3