Fixed merge

main
Kyle Kress 11 years ago committed by Elbert Alias
parent 5aa775976f
commit 3e2a1df721

@ -3387,7 +3387,7 @@
"Snap": { "Snap": {
"website": "snapframework.com", "website": "snapframework.com",
"cats": [ 18, 22 ], "cats": [ 18, 22 ],
"headers": { "Server": "Snap/(\\d+(?:\\.\\d+)+)\\;version:\\1" }, "headers": { "Server": "Snap/\\d+(\\.\\d+)+" },
"implies": "Haskell" "implies": "Haskell"
}, },
"Snap.svg": { "Snap.svg": {
@ -4250,7 +4250,7 @@
"Yesod": { "Yesod": {
"website": "www.yesodweb.com", "website": "www.yesodweb.com",
"cats": [ 18, 22 ], "cats": [ 18, 22 ],
"headers": { "Server": "^Warp/(\\d+(?:\\.\\d+)+)\\;version:\\1" }, "headers": { "Server": "^Warp/\\d+(\\.\\d+)+" },
"implies": "Haskell" "implies": "Haskell"
}, },
"Yieldlab": { "Yieldlab": {