From 0c1f7176fcc56a0672583810b0e50a3f9d90f894 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Fri, 17 Apr 2015 21:11:03 +0200
Subject: Revert "weechat/irc: Don't merge server buffers"

This reverts commit 84a281cfd254179c7ba8993edc64a4e3ab3ce82c.
---
 weechat/irc.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weechat/irc.conf b/weechat/irc.conf
index b6bfdb7..ce5d559 100644
--- a/weechat/irc.conf
+++ b/weechat/irc.conf
@@ -52,7 +52,7 @@ part_closes_buffer = off
 pv_buffer = independent
 pv_tags = "notify_private"
 raw_messages = 256
-server_buffer = independent
+server_buffer = merge_with_core
 smart_filter = on
 smart_filter_delay = 5
 smart_filter_join = on
-- 
cgit v1.2.3-70-g09d2