geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-16 12:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bad merge

Browse Source
This commit is contained in:
Fabien Potencier
2019-08-08 00:57:13 +02:00
parent 83e404ee35
commit 98c776b025
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Environment.php
-7
View File
@@ -38,17 +38,10 @@ use Twig\TokenParser\TokenParserInterface;
*/
class Environment
{
<<<<<<< HEAD
const VERSION = '3.0.0-DEV';
const VERSION_ID = 30000;
const MAJOR_VERSION = 3;
const MINOR_VERSION = 0;
=======
const VERSION = '2.12.0-DEV';
const VERSION_ID = 21200;
const MAJOR_VERSION = 2;
const MINOR_VERSION = 12;
>>>>>>> 2.x
const RELEASE_VERSION = 0;
const EXTRA_VERSION = 'DEV';