smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

3.1.22-dev

Browse Source
This commit is contained in:
Uwe Tews
2014-10-31 05:48:52 +01:00
parent 21204c6613
commit 84e5ef7345
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/Smarty.class.php
View File

@@ -2,10 +2,7 @@
/** /**
* Project: Smarty: the PHP compiling template engine * Project: Smarty: the PHP compiling template engine
* File: Smarty.class.php * File: Smarty.class.php
<<<<<<< HEAD *
* SVN: $Id$
=======
>>>>>>> trunk
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
@@ -27,11 +24,7 @@
* @author Uwe Tews * @author Uwe Tews
* @author Rodney Rehm * @author Rodney Rehm
* @package Smarty * @package Smarty
<<<<<<< HEAD
* @version 3.1-DEV
=======
* @version 3.1.22-dev * @version 3.1.22-dev
>>>>>>> trunk
*/ */
/** /**
@@ -117,11 +110,8 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
<<<<<<< HEAD
const SMARTY_VERSION = 'Smarty-3.1.21';
=======
const SMARTY_VERSION = 'Smarty-3.1.22-dev/1'; const SMARTY_VERSION = 'Smarty-3.1.22-dev/1';
>>>>>>> trunk
/** /**
* define variable scopes * define variable scopes