fix conflict in phpfspot_tmpl.php

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

diff --combined phpfspot_tmpl.php
index f6d3ce85db83e93e4074bb1a949eef59f5e0e20a,e8bb48a5a5e7bec4d95765a75934f6eb2562bdcf..bf0f835ff9008834a9b3f4ee85b39b3fc0a9b7d2
--- 1/phpfspot_tmpl.php
--- 2/phpfspot_tmpl.php
+++ b/phpfspot_tmpl.php
@@@ -22,17 -22,8 +22,18 @@@
   *
   ***************************************************************************/
  
 +/**
 + * PHPFSPOT_TMPL class
 + *
 + * Extends Smarty base class with some additional functions
 + * @package phpfspot
 + */
  class PHPFSPOT_TMPL extends Smarty {
  
-     * class constructor
 +   /**
++    * PHPFSPOT_TMPL constructor
++    * @access public
 +    */
     public function __construct()
     {
        global $phpfspot;
@@@ -55,18 -46,12 +56,18 @@@
  
     } // __construct()
  
 +   /**
 +    * show template
 +    *
 +    * outputs the requested template
 +    * @param string $template
 +    */
     public function show($template)
     {
        $this->display($template);
  
     } // show()
  
 -}
 +} // PHPFSPOT_TMPL()
  
  ?>