Resolve merge conflict

[akkoma] / test / web / federator_test.exs

diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs
index 87bf73dbd34659422d6b37cda103e6841a0593ca..a49265c0c7d93054ae69de572c12b55caac18d8d 100644 (file)
--- a/test/web/federator_test.exs
+++ b/test/web/federator_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.FederatorTest do
   alias Pleroma.Web.Federator
   alias Pleroma.Web.CommonAPI