BUG: refs #0381. Trailing space from merge resolution removed.

Michael Grauer · Michael Grauer · commit 6a2366ffe6e9 · 2011-12-02T17:10:51.000-05:00
diff --git a/core/GlobalController.php b/core/GlobalController.php
@@ -192,7 +192,7 @@ public function loadElements()
         $nameForm = $forms . "Form";
 
         Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');
-        
+
         if(!isset($this->Form))
           {
           $this->Form =  new stdClass();

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function loadElements()`
`192`	`192`	`$nameForm = $forms . "Form";`
`193`	`193`
`194`	`194`	`Zend_Loader::loadClass($nameForm, BASE_PATH . '/core/controllers/forms');`
`195`		`-`
	`195`	`+`
`196`	`196`	`if(!isset($this->Form))`
`197`	`197`	`{`
`198`	`198`	`$this->Form = new stdClass();`