fix conflicts.

taylorotwell · taylorotwell · commit 51d1084343dd · 2013-09-12T21:49:42.000-05:00
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -32,7 +32,7 @@ class Application extends Container implements HttpKernelInterface, ResponsePrep
 	 *
 	 * @var string
 	 */
-	const VERSION = '4.0.6';
+	const VERSION = '4.0.7';
 
 	/**
 	 * Indicates if the application has "booted".

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class Application extends Container implements HttpKernelInterface, ResponsePrep`
`32`	`32`	`*`
`33`	`33`	`* @var string`
`34`	`34`	`*/`
`35`		`- const VERSION = '4.0.6';`
	`35`	`+ const VERSION = '4.0.7';`
`36`	`36`
`37`	`37`	`/**`
`38`	`38`	`* Indicates if the application has "booted".`