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 de50a13c1762e2a61a8d46f0f9b2145c8495ba39..fc533da23cd2fa0194d96c7185a3014869da7be1 100644 (file)
--- a/lib/pleroma/uploaders/local.ex
+++ b/lib/pleroma/uploaders/local.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Uploaders.Local do