Resolve merge conflict

[akkoma] / lib / pleroma / list.ex

diff --git a/lib/pleroma/list.ex b/lib/pleroma/list.ex
index c5bf3e0831f0302fc598ebfdbc505e9d6793404a..a75dc006ee6a661fc6b0f729e07068df8dad97dc 100644 (file)
--- a/lib/pleroma/list.ex
+++ b/lib/pleroma/list.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.List do
   use Ecto.Schema
   import Ecto.{Changeset, Query}