From b5bca93fe946ecdee24bb11a10ae35d80922846f Mon Sep 17 00:00:00 2001 From: Zach Daniel Date: Tue, 14 Feb 2023 22:24:01 -0500 Subject: [PATCH] chore: fix git conflict in guide --- ...ng-started-with-ash-authentication-phoenix.md | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/documentation/tutorials/getting-started-with-ash-authentication-phoenix.md b/documentation/tutorials/getting-started-with-ash-authentication-phoenix.md index 02af2f6..4ef018d 100644 --- a/documentation/tutorials/getting-started-with-ash-authentication-phoenix.md +++ b/documentation/tutorials/getting-started-with-ash-authentication-phoenix.md @@ -17,7 +17,7 @@ $ cd example ### 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** @@ -30,16 +30,10 @@ defmodule Example.MixProject do [ # ... # add these lines --> - {:ash, "~> 2.5.11"}, - {:ash_authentication, "~> 3.7.3"}, -<<<<<<< Updated upstream - {:ash_authentication_phoenix, "~> 1.5.0"}, - {: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 + {:ash, "~> x.x"}, + {:ash_authentication, "~> x.x"}, + {:ash_authentication_phoenix, "~> x.x"}, + {:ash_postgres, "~> x.x"} # <-- add these lines ] end