Resolve merge conflicts and remove IO.inspects

[akkoma] / lib / pleroma / uploaders / local.ex

diff --git a/lib/pleroma/uploaders/local.ex b/lib/pleroma/uploaders/local.ex
index 434a6b51585689c83c317ed087fe089b7f146654..fc533da23cd2fa0194d96c7185a3014869da7be1 100644 (file)
--- a/lib/pleroma/uploaders/local.ex
+++ b/lib/pleroma/uploaders/local.ex
@@ -1,8 +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.Uploaders.Local do
   @behaviour Pleroma.Uploaders.Uploader
 
-  alias Pleroma.Web
-
   def get_file(_) do
     {:ok, {:static_dir, upload_path()}}
   end