From f26025d4733c6595a2b83ae1cfe6df5238987140 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Thu, 25 Apr 2019 23:29:39 +0200
Subject: [PATCH] Fixed SSH config, diabled tramp SSH override.

---
 init.el       | 4 +++-
 server/server | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index 50b0d9d..a1b81f6 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,5 @@
 ;;; init.el --- tastytea's Emacs init file.
-;; Time-stamp: <2019-04-25T21:04:24+00:00>
+;; Time-stamp: <2019-04-25T21:28:05+00:00>
 
 ;;; Commentary:
 ;; I am using this file with Emacs 26, but most of it will probably work with
@@ -880,6 +880,8 @@ With argument, do this that many times."
             server-port 51313
             server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server.
             "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh")
+      :custom
+      (tramp-use-ssh-controlmaster-options nil) ; Don't override SSH config.
       :config
       (unless (server-running-p)
         (server-start))
diff --git a/server/server b/server/server
index 6ec2ff7..d1e3459 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 1784
+127.0.0.1:51313 24444
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file