diff options
author | Greg Aker <greg.aker@ellislab.com> | 2011-03-09 05:05:10 +0100 |
---|---|---|
committer | Greg Aker <greg.aker@ellislab.com> | 2011-03-09 05:05:10 +0100 |
commit | 2fad65e97309ef254dc18ac43a12ead88c21d5a9 (patch) | |
tree | 558e7e62dfaed22b4c9c766d3ea8075223014d5d /application | |
parent | 1e85af54ffc3e31938ec85987849a93c28bb988d (diff) | |
parent | 03103109eabae90f7c34ea0545d27f01eebc31f7 (diff) |
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'application')
-rw-r--r-- | application/controllers/welcome.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index 79689f012..4ed67500b 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -2,12 +2,7 @@ class Welcome extends CI_Controller { - function __construct() - { - parent::__construct(); - } - - function index() + public function index() { $this->load->view('welcome_message'); } |