@@ -1231,10 +1231,6 @@ packages:
1231 - clash-ghc
1231 - clash-ghc
1233 "Athan Clark <athan.clark@gmail.com> @athanclark":
1233 "Athan Clark <athan.clark@gmail.com> @athanclark":
1235− # https://github.com/athanclark/nested-routes/issues/9
1237−>>>>>>> b233f7bbf4edd1aa69a4e818795b3541126cc540
1238 - commutative
1234 - commutative
1239 - digestive-functors-lucid
1235 - digestive-functors-lucid
@@ -1244,15 +1240,15 @@ packages:
1244 - poly-arity
1240 - poly-arity
1245 - urlpath
1241 - urlpath
1246 - wai-transformers
1242 - wai-transformers
1247− # Temporary block due to #1074
1248− # - wai-middleware-content-type
1243+ - wai-middleware-content-type
1249− # - wai-middleware-verbs
1244+ - wai-middleware-verbs
1251 - webpage
1245 - webpage
1252 - composition-extra
1246 - composition-extra
1253 - rose-trees
1247 - rose-trees
1256 - pred-trie
1252 - pred-trie
1258 "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":
1254 "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":