From 68af85701b6f797b0d662b89b95e043ee949defd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 2 Jul 2010 07:14:41 +0000
Subject: Merged branch 1.4.7_MOASP_TSL back into trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1165 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 id/templates/.settings/org.eclipse.wst.common.component | 16 ++++++++--------
 id/templates/pom.xml                                    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'id/templates')

diff --git a/id/templates/.settings/org.eclipse.wst.common.component b/id/templates/.settings/org.eclipse.wst.common.component
index 1e8a98df8..dfa33a627 100644
--- a/id/templates/.settings/org.eclipse.wst.common.component
+++ b/id/templates/.settings/org.eclipse.wst.common.component
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="moa-id-templates">
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <property name="context-root" value="moa-id-templates"/>
-        <property name="java-output-path"/>
-    </wb-module>
-</project-modules>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="moa-id-templates">
+        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
+        <property name="context-root" value="moa-id-templates"/>
+        <property name="java-output-path"/>
+    </wb-module>
+</project-modules>
diff --git a/id/templates/pom.xml b/id/templates/pom.xml
index 004643687..f011940f8 100644
--- a/id/templates/pom.xml
+++ b/id/templates/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>MOA</groupId>
         <artifactId>id</artifactId>
-        <version>1.4.6</version>
+        <version>1.4.7</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-- 
cgit v1.2.3