@@ -1231,10 +1231,6 @@ packages:
12311231 - clash-ghc
12321232
12331233 "Athan Clark <athan.clark@gmail.com> @athanclark":
1234−<<<<<<< HEAD
1235− # https://github.com/athanclark/nested-routes/issues/9
1236−=======
1237−>>>>>>> b233f7bbf4edd1aa69a4e818795b3541126cc540
12381234 - commutative
12391235 - digestive-functors-lucid
12401236 - ltext
@@ -1244,15 +1240,15 @@ packages:
12441240 - poly-arity
12451241 - urlpath
12461242 - wai-transformers
1247− # Temporary block due to #1074
1248− # - wai-middleware-content-type
1249− # - wai-middleware-verbs
1250− # - nested-routes
1243+ - wai-middleware-content-type
1244+ - wai-middleware-verbs
12511245 - webpage
12521246 - composition-extra
12531247 - rose-trees
12541248 - sets
1249+ - timemap
12551250 - tries
1251+ - path-extra
12561252 - pred-trie
12571253
12581254 "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":