From f8f05619c9598ca91ac586ba0b5e43eacd75aea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 11 Jun 2015 16:03:51 +0200
Subject: [PATCH] Commented .htaccess some

---
 .htaccess | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index aaedb777..105d8c48 100755
--- a/.htaccess
+++ b/.htaccess
@@ -4,14 +4,10 @@ RewriteBase /
 RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
+#Comment out the two folling lines when running server locally to fix issues with localhost
 RewriteCond %{HTTPS} !=on
-# This checks to make sure the connection is not already HTTPS
-
 RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-# This rule will redirect users from their original location, to the same location but using HTTPS.
-# i.e.  http://www.example.com/foo/ to https://www.example.com/foo/
-# The leading slash is made optional so that this will work either in httpd.conf
-# or .htaccess context
+
 
 RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]
 RewriteRule ^remote php/controller.php [L]