yogsototh/elm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Go with changes from the dev branch.

Browse source
This commit is contained in:
evancz 2013-05-22 00:32:22 +02:00
parent af75972665
commit abe95cc90e
1 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Elm.cabal
View file

@ -131,40 +131,6 @@ Executable elm
bytestring,
hjsmin,
indents,
<<<<<<< .mine
filepath
test-suite Main
type: exitcode-stdio-1.0
x-uses-tf: true
build-depends: base >=4.2 && <5,
containers >= 0.3,
transformers >= 0.2,
mtl >= 2,
parsec >= 3.1.1,
blaze-html == 0.5.* || == 0.6.*,
blaze-markup == 0.5.1.*,
deepseq,
text,
template-haskell,
shakespeare >= 1,
pandoc >= 1.10,
bytestring,
hjsmin,
indents,
filepath,
QuickCheck >= 2.4,
test-framework >= 0.4.1,
test-framework-quickcheck2,
regex-compat,
interpolatedstring-perl6 >= 0.9
hs-source-dirs: src, tests
main-is: Main.hs
=======
filepath,
template-haskell,
json,
@ -186,15 +152,4 @@ Executable elm-doc
parsec >= 3.1.1,
pandoc >= 1.10,
cmdargs,
indents
>>>>>>> .theirs
indents