From 13f296494409b1a6b02a9a23dbfaa102785b2be0 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <alex@alexbilbie.com>
Date: Fri, 6 Jul 2012 18:15:43 +0100
Subject: [PATCH] Optional $options

---
 src/oauth2server/Server.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/oauth2server/Server.php b/src/oauth2server/Server.php
index 5b63e6b1..cb549296 100644
--- a/src/oauth2server/Server.php
+++ b/src/oauth2server/Server.php
@@ -40,7 +40,6 @@ class Server
 
     public function __construct(array $options = null)
     {
-        $this->options = array_merge($this->config, $options);
         if ($options !== null) {
             $this->options = array_merge($this->config, $options);
         }