From 3e2a1df721aa8cf9f8f491bb52419442e291b5c9 Mon Sep 17 00:00:00 2001
From: Kyle Kress <kkress@tombras.com>
Date: Thu, 29 Jan 2015 14:50:16 -0500
Subject: [PATCH] Fixed merge

---
 share/apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/apps.json b/share/apps.json
index 15cd763f9..339ea8165 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -3387,7 +3387,7 @@
 		"Snap": {
 			"website": "snapframework.com",
 			"cats": [ 18, 22 ],
-			"headers": { "Server": "Snap/(\\d+(?:\\.\\d+)+)\\;version:\\1" },
+			"headers": { "Server": "Snap/\\d+(\\.\\d+)+" },
 			"implies": "Haskell"
 		},
 		"Snap.svg": {
@@ -4250,7 +4250,7 @@
 		"Yesod": {
 			"website": "www.yesodweb.com",
 			"cats": [ 18, 22 ],
-			"headers": { "Server": "^Warp/(\\d+(?:\\.\\d+)+)\\;version:\\1" },
+			"headers": { "Server": "^Warp/\\d+(\\.\\d+)+" },
 			"implies": "Haskell"
 		},
 		"Yieldlab": {