diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
| commit | 01fe5abad1a98b98a0dd5e3c04bf65809389fd78 (patch) | |
| tree | b829b75c225b8ffbacd22884693a622dc7584a70 /lib/mix/tasks | |
| parent | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (diff) | |
| parent | 62cdf701f47352004c293c3ca049d232b3d16af7 (diff) | |
| download | pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.tar.gz | |
Resolve conflicts
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/benchmark.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mix/tasks/benchmark.ex b/lib/mix/tasks/benchmark.ex index 0fbb4dbb1..e4b1a638a 100644 --- a/lib/mix/tasks/benchmark.ex +++ b/lib/mix/tasks/benchmark.ex @@ -7,7 +7,7 @@ defmodule Mix.Tasks.Pleroma.Benchmark do Benchee.run(%{ "search" => fn -> - Pleroma.Web.MastodonAPI.MastodonAPIController.status_search(nil, "cofe") + Pleroma.Activity.search(nil, "cofe") end }) end |