added .gitignore for resolving conflict

This commit is contained in:
Francesco Mangiacrapa 2021-10-14 10:52:38 +02:00
parent f9a966b6e3
commit cba13c365f
3 changed files with 4 additions and 3 deletions

1
.settings/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/org.eclipse.wst.common.component

View File

@ -4,7 +4,7 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [v2.0.0-SNAPSHOT] - 2021-07-30
## [v2.0.0] - 2021-07-30
#### Enhancements

View File

@ -14,7 +14,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>geoportal-data-viewer-app</artifactId>
<packaging>war</packaging>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0</version>
<name>GeoPortal Data Viewer App</name>
<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
@ -54,7 +54,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>maven-portal-bom</artifactId>
<version>3.6.3-SNAPSHOT</version>
<version>3.6.3</version>
<type>pom</type>
<scope>import</scope>
<exclusions>