fix: Remove merge garbage from mix.exs
This commit is contained in:
parent
d0a6677cdd
commit
6a1eac6b1e
1 changed files with 0 additions and 4 deletions
4
mix.exs
4
mix.exs
|
@ -1,11 +1,7 @@
|
||||||
defmodule Legendary.Mixfile do
|
defmodule Legendary.Mixfile do
|
||||||
use Mix.Project
|
use Mix.Project
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
@version "3.0.0"
|
|
||||||
=======
|
|
||||||
@version "4.3.1"
|
@version "4.3.1"
|
||||||
>>>>>>> 52db6ba1e087e55e1f3863277bfbaa3aa060af00
|
|
||||||
|
|
||||||
def project do
|
def project do
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in a new issue