summaryrefslogtreecommitdiff
path: root/libraries/base/base.cabal
diff options
context:
space:
mode:
authorJose Pedro Magalhaes <jpm@cs.ox.ac.uk>2014-11-04 11:10:27 +0000
committerJose Pedro Magalhaes <jpm@cs.ox.ac.uk>2014-11-04 11:10:27 +0000
commit3744afb5d91ebbe235230b7e9a03e1918ed4aa2c (patch)
treeae953eebc9230a176721b49c64f8a63102b627f6 /libraries/base/base.cabal
parentd8e899686d7f3092af54932f46ab122dc8d3d373 (diff)
parentd3a7126ff749d1eff31128ace31bcea26c4eadaa (diff)
downloadhaskell-wip/GenericsMetaData.tar.gz
Merge branch 'master' into wip/GenericsMetaDatawip/GenericsMetaData
Diffstat (limited to 'libraries/base/base.cabal')
-rw-r--r--libraries/base/base.cabal1
1 files changed, 0 insertions, 1 deletions
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 957053dd15..6277d89e79 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -69,7 +69,6 @@ Library
NegativeLiterals
NoImplicitPrelude
NondecreasingIndentation
- OverlappingInstances
OverloadedStrings
ParallelArrays
PolyKinds