Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorotwell committed Aug 23, 2016
2 parents ecbb94b + 876189b commit f24b7ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn
*
* @var string
*/
const VERSION = '5.2.43';
const VERSION = '5.2.44';

/**
* The base path for the Laravel installation.
Expand Down

0 comments on commit f24b7ac

Please sign in to comment.