diff options
author | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
commit | 65db5e9f528a3f8d8b3c81953fd160a6744dfffd (patch) | |
tree | 9da5234f8a9dd411b59e839eeb38254822939e2f /test/support/websub_mock.ex | |
parent | 300d94c62829d0ec961f3ed6c0242dea102ab0ad (diff) | |
parent | f8d4c02431aa634dc74074b93d1cb522e47056ce (diff) | |
download | pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.tar.gz pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.zip |
Resolve merge conflicts
Diffstat (limited to 'test/support/websub_mock.ex')
-rw-r--r-- | test/support/websub_mock.ex | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/test/support/websub_mock.ex b/test/support/websub_mock.ex deleted file mode 100644 index e3d5a5b16..000000000 --- a/test/support/websub_mock.ex +++ /dev/null @@ -1,9 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Web.WebsubMock do - def verify(sub) do - {:ok, sub} - end -end |