diff options
| author | misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-04-17 10:08:03 +0000 |
|---|---|---|
| committer | misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-04-17 10:08:03 +0000 |
| commit | c28abd698c86754521cb9c4828f9f3cbccfaf1fc (patch) | |
| tree | e4d10ad4afa48d3820bb390ad85ae1539a1f15b2 | |
| parent | 5a57add03b77749db7d8187079f582ac9356191f (diff) | |
| download | elgg-c28abd698c86754521cb9c4828f9f3cbccfaf1fc.tar.gz elgg-c28abd698c86754521cb9c4828f9f3cbccfaf1fc.tar.bz2 | |
Misja Hoebe <misja@curverider.co.uk> Clean up svn cruft
git-svn-id: https://code.elgg.org/elgg/trunk@480 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | htaccess_dist | 2 |
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
|