fix conflicts

theblitzapp · Oct 30, 2023 · 2b0d3a7 · 2b0d3a7
1 parent f0c3e44
commit 2b0d3a7
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/mix.exs b/mix.exs
@@ -6,8 +6,7 @@ defmodule FactoryEx.MixProject do
  app: :factory_ex,
  version: "0.3.3",
  elixir: "~> 1.13",
- description:
- "Factories for elixir to help create data models at random, this works for any type of ecto structs",
+ description: "Factories for elixir to help create data models at random, this works for any type of ecto structs",
  elixirc_paths: elixirc_paths(Mix.env()),
  start_permanent: Mix.env() == :prod,
  deps: deps(),
@@ -43,7 +42,7 @@ defmodule FactoryEx.MixProject do
  [
  {:ecto, "~> 3.0"},
  {:faker, ">= 0.0.0"},
- {:nimble_options, "~> 0.5"},
+ {:nimble_options, "~> 0.4"},
  {:elixir_cache, "~> 0.3"},
  {:ecto_sql, "~> 3.0", only: [:test, :dev], optional: true},
  {:postgrex, "~> 0.16", only: [:test, :dev], optional: true},
@@ -71,10 +70,8 @@ defmodule FactoryEx.MixProject do
  groups_for_modules: [
  General: [
  FactoryEx,
- FactoryEx.SchemaCounter
- ],
- Adapters: [
- FactoryEx.Adapter
+ FactoryEx.SchemaCounter,
+ FactoryEx.FactoryCache
  ]
  ]
  ]