Resolved merge conflicts

Signed-off-by: Prabhav Thali <[email protected]>
eclipse-che · Jul 17, 2020 · cc82946 · cc82946
1 parent 847a97e
commit cc82946
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     </parent>
     <groupId>org.eclipse.che.dashboard</groupId>
     <artifactId>che-dashboard-war</artifactId>
-    <version>7.16.0-SNAPSHOT</version>
+    <version>7.17.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>Che Dashboard :: Web App</name>
     <inceptionYear>2015</inceptionYear>