o merged from r726427 (removed tab and one line for xsi:schemaLocation)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@726429 13f79535-47bb-0310-9956-ffa450edef68

maven-distribution/src/conf/settings.xml

@@ -43,8 +43,7 @@ under the License.
  |-->
 <settings xmlns="http://maven.apache.org/settings/1.0.0" 
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-          xsi:schemaLocation="http://maven.apache.org/setrings/1.0.0 
-          http://maven.apache.org/xsd/settings-1.0.0.xsd">
+          xsi:schemaLocation="http://maven.apache.org/setrings/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
   <!-- localRepository
    | The path to the local repository maven will use to store artifacts.
    |
@@ -187,12 +186,12 @@ under the License.
 
       <repositories>
         <repository>
-	  <id>jdk14</id>
-	  <name>Repository for JDK 1.4 builds</name>
-	  <url>http://www.myhost.com/maven/jdk14</url>
-	  <layout>default</layout>
-	  <snapshotPolicy>always</snapshotPolicy>
-	</repository>
+          <id>jdk14</id>
+          <name>Repository for JDK 1.4 builds</name>
+          <url>http://www.myhost.com/maven/jdk14</url>
+          <layout>default</layout>
+          <snapshotPolicy>always</snapshotPolicy>
+        </repository>
       </repositories>
     </profile>
     -->
@@ -221,9 +220,9 @@ under the License.
 
       <activation>
         <property>
-	  <name>target-env</name>
-	  <value>dev</value>
-	</property>
+          <name>target-env</name>
+          <value>dev</value>
+        </property>
       </activation>
 
       <properties>