fixing merge issues for comment tweaks

laravel/cookie.php

@@ -77,7 +77,7 @@ class Cookie {
 
 		// If the secure option is set to true, yet the request is not over HTTPS
 		// we'll throw an exception to let the developer know that they are
-		// attempting to send a secure cookie over the unsecured HTTP.
+		// attempting to send a secure cookie over the insecure HTTP.
 		if ($secure and ! Request::secure())
 		{
 			throw new \Exception("Attempting to set secure cookie over HTTP.");
@@ -120,4 +120,4 @@ class Cookie {
 		return static::put($name, null, -2000, $path, $domain, $secure);
 	}
 
-}
+}