From: Andreas Unterkircher <unki@netshadow.at>
Date: Sat, 12 Apr 2008 16:30:10 +0000 (+0200)
Subject: fix conflict in phpfspot_tmpl.php
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b583a04ebad60d02349b78f8c38353e0cb3eb9ea;p=phpfspot.git

fix conflict in phpfspot_tmpl.php

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

b583a04ebad60d02349b78f8c38353e0cb3eb9ea
diff --cc phpfspot_tmpl.php
index f6d3ce8,e8bb48a..bf0f835
--- a/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;