From cc82946ffbb2c095a5d2a079896a17e827623038 Mon Sep 17 00:00:00 2001
From: Prabhav Thali <Prabhav.Thali1@ibm.com>
Date: Fri, 17 Jul 2020 11:01:58 +0530
Subject: [PATCH] Resolved merge conflicts

Signed-off-by: Prabhav Thali <Prabhav.Thali1@ibm.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8ea4a01c26..24f3630f17 100644
--- 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>