git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/EcologicalEngine@126577 82a268e6-3cf1-43bd-a215-b396298e98cf

distro/README

@@ -30,18 +30,7 @@ Maintainers
 * Gianpaolo Coro (gianpaolo.coro-AT-isti.cnr.it), 
 		Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" CNR, Pisa IT
 
-<<<<<<< .mine
  
-=======
-version 1.0.0 (01-12-2015)  
-
-Description
---------------------
-
-Support library for statistics analysis on Time Series data.
-
-
->>>>>>> .r126572
 Download information
 --------------------------------------------------
  
@@ -56,7 +45,7 @@ Installation
 --------------------------------------------------
  
 Installation documentation is available on-line in the gCube Wiki:
-	https://wiki.gcube-system.org/gcube/About_gCube
+	https://wiki.gcube-system.org/gcube
   
  
 Documentation 

distro/changelog.xml

@@ -0,0 +1,5 @@
+<ReleaseNotes>
+	<Changeset component="${groupId}.${artifactId}.1-1-0" date="2016-10-03">
+		<Change>First Release</Change>
+	</Changeset>
+</ReleaseNotes>

distro/profile.xml

@@ -3,15 +3,9 @@
 	<ID></ID>
 	<Type>Service</Type>
 	<Profile>
-<<<<<<< .mine
 		<Description>${project.description}</Description>
 		<Class>DataAnalysis</Class>
 		<Name>${project.name}</Name>
-=======
-		<Description>Connector to the SeaDataNet e-Infrastructure</Description>
-		<Class>SeaDataNetConnector</Class>
-	<Name>${artifactId}</Name>
->>>>>>> .r126572
 		<Version>1.0.0</Version>
 		<Packages>
 			<Software>