From d4a481f251d7c169c628dda30cf42cf3901844b3 Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de>
Date: Sat, 18 May 2019 10:31:29 +0200
Subject: [PATCH] Added meld as mergetool and difftool.

---
 server/server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/server b/server/server
index f0d6f2e..45ab964 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 29563
+127.0.0.1:51313 10599
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file