mirror of
https://github.com/team-alembic/ash_authentication_phoenix.git
synced 2024-09-20 05:23:55 +12:00
chore: fix git conflict in guide
This commit is contained in:
parent
2e5f93f546
commit
b5bca93fe9
1 changed files with 5 additions and 11 deletions
|
@ -17,7 +17,7 @@ $ cd example
|
||||||
|
|
||||||
### Application Dependencies
|
### Application Dependencies
|
||||||
|
|
||||||
We need to add the following dependencies:
|
We need to add the following dependencies. Use `mix hex.info dependency_name` to get the latest version of each dependency.
|
||||||
|
|
||||||
**mix.exs**
|
**mix.exs**
|
||||||
|
|
||||||
|
@ -30,16 +30,10 @@ defmodule Example.MixProject do
|
||||||
[
|
[
|
||||||
# ...
|
# ...
|
||||||
# add these lines -->
|
# add these lines -->
|
||||||
{:ash, "~> 2.5.11"},
|
{:ash, "~> x.x"},
|
||||||
{:ash_authentication, "~> 3.7.3"},
|
{:ash_authentication, "~> x.x"},
|
||||||
<<<<<<< Updated upstream
|
{:ash_authentication_phoenix, "~> x.x"},
|
||||||
{:ash_authentication_phoenix, "~> 1.5.0"},
|
{:ash_postgres, "~> x.x"}
|
||||||
{:ash_postgres, "~> 1.3.2"},
|
|
||||||
{:elixir_sense, github: "elixir-lsp/elixir_sense", only: [:dev, :test]}
|
|
||||||
=======
|
|
||||||
{:ash_authentication_phoenix, "~> 1.4.6"},
|
|
||||||
{:ash_postgres, "~> 1.3.2"}
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
# <-- add these lines
|
# <-- add these lines
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue