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 /config/test.exs | |
| parent | 300d94c62829d0ec961f3ed6c0242dea102ab0ad (diff) | |
| parent | f8d4c02431aa634dc74074b93d1cb522e47056ce (diff) | |
| download | pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.tar.gz pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.zip | |
Resolve merge conflicts
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index 6100989c4..41cddb9bd 100644 --- a/config/test.exs +++ b/config/test.exs @@ -39,8 +39,6 @@ config :pleroma, Pleroma.Repo, # Reduce hash rounds for testing config :pbkdf2_elixir, rounds: 1 -config :pleroma, :websub, Pleroma.Web.WebsubMock -config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :tesla, adapter: Tesla.Mock config :pleroma, :rich_media, enabled: false |