From f4245d59af681e73ad00a02b947ba9d0a33bb828 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 9 May 2016 21:51:59 +0200
Subject: [PATCH] Update auto-connect channels for Circe

---
 emacs/.emacs.d/init-circe.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/emacs/.emacs.d/init-circe.org b/emacs/.emacs.d/init-circe.org
index 800eb2e..d0ab011 100644
--- a/emacs/.emacs.d/init-circe.org
+++ b/emacs/.emacs.d/init-circe.org
@@ -168,15 +168,15 @@ wanted it. So now I use Circe.
                         "#mowedline"
                         "#ninthfloor"
                         "#dispass"
-                        "#linuxvoice")
+                        "#linuxvoice"
+                        "#conkeror")
              :nickserv-password ,(oni:circe-nickserv-password-getter "irc.freenode.net"))
             ("Twitch"
              :use-tls nil
              :nick "ryuslash"
              :host "irc.twitch.tv"
              :pass ,(oni:circe-nickserv-password-getter "irc.twitch.tv")
-             :port 6667
-             :channels ("#escondida"))))
+             :port 6667)))
   #+END_SRC
 
 * Show #mowedline in a frame without minibuffer