projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Resolve merge conflict
[akkoma]
/
test
/
web
/
retry_queue_test.exs
diff --git
a/test/web/retry_queue_test.exs
b/test/web/retry_queue_test.exs
index b5a6ab030c9252ef7162b529c05bb83913a237d1..9351b6c24bd14e5a7994feb443d48f7d4c86d029 100644
(file)
--- a/
test/web/retry_queue_test.exs
+++ b/
test/web/retry_queue_test.exs
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule MockActivityPub do
def publish_one(ret) do
{ret, "success"}