diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bad merge

Browse Source
This commit is contained in:
Fabien Potencier 2017-07-05 09:33:38 +03:00
parent ecaae2368d
commit d879eed12a
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -59,19 +59,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
<<<<<<< HEAD
const VERSION = '2.8.24-DEV';
const VERSION_ID = 20824;
const MAJOR_VERSION = 2;
const MINOR_VERSION = 8;
const RELEASE_VERSION = 24;
=======
const VERSION = '2.7.31-DEV';
const VERSION_ID = 20731;
const MAJOR_VERSION = 2;
const MINOR_VERSION = 7;
const RELEASE_VERSION = 31;
>>>>>>> 2.7
const EXTRA_VERSION = 'DEV';
const END_OF_MAINTENANCE = '11/2018';