Merge branch '1.2.x'

2016-01-12 10:17:21 +00:00
parent e4e9a71753 6117b6c5c8
commit 2aff82bb64
6 changed files with 32 additions and 32 deletions
--- a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
@@ -6,9 +6,9 @@
 	<artifactId>executable-war</artifactId>
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<packaging>war</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>