Remove missed conflict

JesseHerrick · JesseHerrick · commit cb50d8bf4882 · 2025-06-06T13:56:26.000-04:00
diff --git a/README.md b/README.md
@@ -42,11 +42,7 @@ Add `:styler` as a dependency to your project's `mix.exs`:
 ```elixir
 def deps do
   [
-<<<<<<< HEAD
-    {:styler, "~> 1.1", only: [:dev, :test], runtime: false},
-=======
     {:styler, "~> 1.4", only: [:dev, :test], runtime: false},
->>>>>>> upstream/main
   ]
 end
 ```

Original file line number	Diff line number	Diff line change
@@ -42,11 +42,7 @@ Add `:styler` as a dependency to your project's `mix.exs`:
`42`	`42`	```elixir
`43`	`43`	`def deps do`
`44`	`44`	`[`
`45`		`-<<<<<<< HEAD`
`46`		`- {:styler, "~> 1.1", only: [:dev, :test], runtime: false},`
`47`		`-=======`
`48`	`45`	`{:styler, "~> 1.4", only: [:dev, :test], runtime: false},`
`49`		`->>>>>>> upstream/main`
`50`	`46`	`]`
`51`	`47`	`end`
`52`	`48`	```