aboutsummaryrefslogtreecommitdiff
path: root/htaccess_dist
diff options
context:
space:
mode:
Diffstat (limited to 'htaccess_dist')
-rw-r--r--htaccess_dist2
1 files changed, 1 insertions, 1 deletions
diff --git a/htaccess_dist b/htaccess_dist
index 8db85934d..1f5102b99 100644
--- a/htaccess_dist
+++ b/htaccess_dist
@@ -10,7 +10,7 @@ RewriteEngine on
RewriteRule ^action\/([A-Za-z\_\-\/]+)$ action.php?action=$1
RewriteRule ^actions\/([A-Za-z\_\-\/]+)$ action.php?action=$1
RewriteRule ^odd\/([A-Za-z\_\-\/]+)$ odd/handler.php?guid=$1
-RewriteRule ^odd\/([A-Za-z\_\-\/]+)\/([A-Za-z\_\-\/]+)\/([A-Za-z\_\-\/]+)$ odd/handler.php?guid=$1&type=$2&idname=$3>>>>>>> .r470
+RewriteRule ^odd\/([A-Za-z\_\-\/]+)\/([A-Za-z\_\-\/]+)\/([A-Za-z\_\-\/]+)$ odd/handler.php?guid=$1&type=$2&idname=$3
RewriteRule ^\_css\/css\.css$ css/css.php