From 2f0203a4a1c7a507aa5cf50be2fd372536ebfc81 Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@gmail.com>
Date: Wed, 17 Apr 2019 16:59:05 +0700
Subject: Resolve conflicts

---
 mix.exs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mix.exs')

diff --git a/mix.exs b/mix.exs
index 15e182239..da2e284f8 100644
--- a/mix.exs
+++ b/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
 
-- 
cgit v1.2.3