Resolve conflicts
This commit is contained in:
parent
87013f8438
commit
2f0203a4a1
5 changed files with 57 additions and 33 deletions
5
mix.exs
5
mix.exs
|
|
@ -8,7 +8,7 @@ defmodule Pleroma.Mixfile do
|
|||
elixir: "~> 1.7",
|
||||
elixirc_paths: elixirc_paths(Mix.env()),
|
||||
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
|
||||
elixirc_options: [warnings_as_errors: true],
|
||||
# elixirc_options: [warnings_as_errors: true],
|
||||
xref: [exclude: [:eldap]],
|
||||
start_permanent: Mix.env() == :prod,
|
||||
aliases: aliases(),
|
||||
|
|
@ -110,7 +110,8 @@ defmodule Pleroma.Mixfile do
|
|||
{:prometheus_ecto, "~> 1.4"},
|
||||
{:prometheus_process_collector, "~> 1.4"},
|
||||
{:recon, github: "ferd/recon", tag: "2.4.0"},
|
||||
{:quack, "~> 0.1.1"}
|
||||
{:quack, "~> 0.1.1"},
|
||||
{:quantum, "~> 2.3"}
|
||||
] ++ oauth_deps
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue