From 096f8249c320e001857b047a9407983b4101ea57 Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Wed, 14 Apr 2021 16:05:59 -0700
Subject: [PATCH] Resolve conflict in Constants

---
 Oqtane.Shared/Shared/Constants.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index e7636ed0..60106dd2 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -5,8 +5,8 @@ namespace Oqtane.Shared {
 
     public class Constants {
         public const string PackageId = "Oqtane.Framework";
-        public const string Version = "2.1.0";
-        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0";
+        public const string Version = "2.0.2";
+        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2";
 
         public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
         public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";