From 7d5720f2e40015502fe646b86768ab8454f571fe Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 5 Dec 2018 21:31:02 +0100
Subject: [PATCH] Fix merge.

---
 lib/pleroma/user/info.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index 6829c26f6..7a99787f8 100644
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -136,7 +136,7 @@ defmodule Pleroma.User.Info do
       :no_rich_text,
       :default_scope,
       :banner,
-      :hide_network
+      :hide_network,
       :background
     ])
   end