Resolve merge conflict

[akkoma] / test / web / plugs / federating_plug_test.exs

diff --git a/test/web/plugs/federating_plug_test.exs b/test/web/plugs/federating_plug_test.exs
index 1455a1c467ddce6ecd832a71b5b9367126ef83de..612db7e32e608cfeec6479bf04fda039e6140c11 100644 (file)
--- a/test/web/plugs/federating_plug_test.exs
+++ b/test/web/plugs/federating_plug_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.FederatingPlugTest do
   use Pleroma.Web.ConnCase