Resolve merge conflict

[akkoma] / lib / pleroma / repo.ex

diff --git a/lib/pleroma/repo.ex b/lib/pleroma/repo.ex
index 0b49f7712fc30c3d600883a0990b11893d674c89..e6a51b19e7866156732dbdbb1f3020a771e8555f 100644 (file)
--- a/lib/pleroma/repo.ex
+++ b/lib/pleroma/repo.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.Repo do