From abe95cc90eeb18012ee2518e34fa6308f57b3483 Mon Sep 17 00:00:00 2001
From: evancz <info@elm-lang.org>
Date: Wed, 22 May 2013 00:32:22 +0200
Subject: [PATCH] Go with changes from the dev branch.

---
 Elm.cabal | 47 +----------------------------------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

diff --git a/Elm.cabal b/Elm.cabal
index d304871..3c3846d 100644
--- a/Elm.cabal
+++ b/Elm.cabal
@@ -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
\ No newline at end of file