@@ -131,40 +131,6 @@ Executable elm
131131 bytestring,
132132 hjsmin,
133133 indents,
134−<<<<<<< .mine
135− filepath
136−
137−
138−test-suite Main
139− type: exitcode-stdio-1.0
140− x-uses-tf: true
141−
142− build-depends: base >=4.2 && <5,
143− containers >= 0.3,
144− transformers >= 0.2,
145− mtl >= 2,
146− parsec >= 3.1.1,
147− blaze-html == 0.5.* || == 0.6.*,
148− blaze-markup == 0.5.1.*,
149− deepseq,
150− text,
151− template-haskell,
152− shakespeare >= 1,
153− pandoc >= 1.10,
154− bytestring,
155− hjsmin,
156− indents,
157− filepath,
158−
159− QuickCheck >= 2.4,
160− test-framework >= 0.4.1,
161− test-framework-quickcheck2,
162− regex-compat,
163− interpolatedstring-perl6 >= 0.9
164−
165− hs-source-dirs: src, tests
166− main-is: Main.hs
167−=======
168134 filepath,
169135 template-haskell,
170136 json,
@@ -186,15 +152,4 @@ Executable elm-doc
186152 parsec >= 3.1.1,
187153 pandoc >= 1.10,
188154 cmdargs,
189− indents
190−
191−
192−
193−
194−
195−
196−
197−
198−
199−
200−>>>>>>> .theirs
155+ indents