summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-05-13 13:46:39 +0200
committerDerek Allard <derek.allard@ellislab.com>2008-05-13 13:46:39 +0200
commit687cdcaa4bc45a616308e3ecdf735d87065153a5 (patch)
tree06a838cf13febce77234e125fbe9a4651201b208
parent1c4a7b4b2b955a33f619605ac3d6d6d63a85b207 (diff)
removed some stray testing code
-rw-r--r--system/application/controllers/welcome.php34
-rw-r--r--system/application/views/welcome_message.php6
2 files changed, 17 insertions, 23 deletions
diff --git a/system/application/controllers/welcome.php b/system/application/controllers/welcome.php
index 9ab91d039..ec16000df 100644
--- a/system/application/controllers/welcome.php
+++ b/system/application/controllers/welcome.php
@@ -1,19 +1,17 @@
-<?php
-
-class Welcome extends Controller {
-
- function Welcome()
- {
- parent::Controller();
- }
-
- function index()
- {
- $this->load->view('welcome_message');
- $this->load->view('fake');
-
- }
-}
-
-/* End of file welcome.php */
+<?php
+
+class Welcome extends Controller {
+
+ function Welcome()
+ {
+ parent::Controller();
+ }
+
+ function index()
+ {
+ $this->load->view('welcome_message');
+ }
+}
+
+/* End of file welcome.php */
/* Location: ./system/application/controllers/welcome.php */ \ No newline at end of file
diff --git a/system/application/views/welcome_message.php b/system/application/views/welcome_message.php
index 40997b6b2..8313059e4 100644
--- a/system/application/views/welcome_message.php
+++ b/system/application/views/welcome_message.php
@@ -59,8 +59,4 @@ code {
<p><br />Page rendered in {elapsed_time} seconds</p>
</body>
-</html>
-<?php
-
-echo 'grandma';
-
+</html> \ No newline at end of file