[tor-commits] [tpo/master] typo

[emmapeel at torproject.org]

commit ea6f0f57dbaa63c474918d782dd2e71d3aaa7050
Author: emma peel <emma.peel at riseup.net>
Date:   Wed Mar 27 10:35:53 2019 +0100

    typo
---
 .htaccess | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.htaccess b/.htaccess
index 218680a..bdf2262 100644
--- a/.htaccess
+++ b/.htaccess
@@ -61,11 +61,7 @@ RewriteRule ^about/contact(.*) /contact$1 [R=301,L]
 RewriteRule ^download/download/$ /download [R=301,L]
 RewriteRule ^download/download.html(.*) /download [R=301,L]
 RewriteRule ^download/easy-download(.*) /download [R=301,L]
-<<<<<<< HEAD
 RewriteRule ^download/download-easy(.*) /download [R=302,L]
-=======
-RewriteRule ^download/download-easy(.*) /download [R=301,L]
->>>>>>> Update htaccess
 
 # Relays
 RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L]