Revert "fix for netPhotoGraphics#1174"

This reverts commit b239629.
sbillard · Jul 2, 2018 · 7454060 · 7454060
1 parent 32931b4
commit 7454060
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/zp-core/zp-extensions/seo_zenphoto.php b/zp-core/zp-extensions/seo_zenphoto.php
@@ -258,6 +258,13 @@ function handleOption($option, $currentValue) {
 			"Ṥ" => "S",
 			"Ṧ" => "S",
 			"Ṩ" => "S",
+<<<<<<< HEAD
+=======
+			"ṩ" => "s",
+			"ß" => "ss",
+			"ſ" => "ss",
+			"ẛ" => "t",
+>>>>>>> parent of b2396291c... fix for #1174
 			"Ṫ" => "T",
 			"Ť" => "T",
 			"Ƭ" => "T",