summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2016-02-01 10:54:56 +0100
committerJasper Van der Jeugt <m@jaspervdj.be>2016-02-01 10:54:56 +0100
commit38ac6e72fd40de80d9f705a3fb6238f7312111bb (patch)
treeac81d3e774ba29156b4dbc3bdcd81c3aba8a9f0d
parent2d106cda8b9135ead563f9ef937a66849f9e7dcc (diff)
parent068da132a5f70b985203997d7188baaea3990bdc (diff)
downloadstylish-haskell-38ac6e72fd40de80d9f705a3fb6238f7312111bb.tar.gz
Merge branch 'bitemyapp-master'
-rw-r--r--.gitignore16
-rw-r--r--stack.yaml2
2 files changed, 17 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 002f475..8a6f1ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,18 @@
.stack-work
dist
+cabal-dev
+*.o
+*.hi
+*.chi
+*.chs.h
+*.dyn_o
+*.dyn_hi
+.hpc
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config
+*.prof
+*.aux
+*.hp
+.stack-work/
diff --git a/stack.yaml b/stack.yaml
index bee0443..f8a01a5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
packages:
- '.'
extra-deps: []
-resolver: lts-3.4
+resolver: lts-5.0