Resolve merge conflict

[akkoma] / lib / pleroma / stats.ex

diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
index 83b896a16a8d875f5324fe5b2a34d8f5e9cd8038..8a030ecd0e02b557f84785de8fc3d7866f193ee6 100644 (file)
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@@ -1,6 +1,10 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Stats do
   import Ecto.Query
-  alias Pleroma.{User, Repo, Activity}
+  alias Pleroma.{User, Repo}
 
   def start_link do
     agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)