From 5d6196b3c7faac8dd9d481b01283abf082dad440 Mon Sep 17 00:00:00 2001
From: Martin Ruiz <martin.ruiz.mares@gmail.com>
Date: Thu, 18 Apr 2024 15:01:17 -0700
Subject: [PATCH] [UI] Add new themes to User pages (#9914)

* [UI] Add new themes to User pages
---
 src/NuGetGallery/Views/Users/ApiKeys.cshtml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/NuGetGallery/Views/Users/ApiKeys.cshtml b/src/NuGetGallery/Views/Users/ApiKeys.cshtml
index 82fa5f1d52..7a31197686 100644
--- a/src/NuGetGallery/Views/Users/ApiKeys.cshtml
+++ b/src/NuGetGallery/Views/Users/ApiKeys.cshtml
@@ -366,7 +366,11 @@
                                         <input name="PushScope" type="radio" value="@NuGetScopes.PackagePush"
                                                data-bind="checked: PushScope, enable: PushNewEnabled,
                                                           attr: { id: PackagePushId }" />
+<<<<<<< HEAD
                                         <span>@NuGetScopes.Describe(NuGetScopes.PackagePush, Model.IsDeprecationApiEnabled)</span>
+=======
+                                        <span>@NuGetScopes.Describe(NuGetScopes.PackagePush)</span>
+>>>>>>> b23f665fc ([UI] Add new themes to User pages (#9914))
                                     </label>
                                 </div>
                             </li>
@@ -379,7 +383,11 @@
                                         <input name="PushScope" type="radio" value="@NuGetScopes.PackagePushVersion"
                                                data-bind="checked: PushScope, enable: PushExistingEnabled,
                                                           attr: { id: PackagePushVersionId }" />
+<<<<<<< HEAD
                                         <span>@NuGetScopes.Describe(NuGetScopes.PackagePushVersion, Model.IsDeprecationApiEnabled)</span>
+=======
+                                        <span>@NuGetScopes.Describe(NuGetScopes.PackagePushVersion)</span>
+>>>>>>> b23f665fc ([UI] Add new themes to User pages (#9914))
                                     </label>
                                 </div>
                             </li>
@@ -391,7 +399,11 @@
                                 <input type="checkbox" value="@NuGetScopes.PackageUnlist"
                                        aria-labelledby="select-scopes-unlist select-scopes"
                                        data-bind="checked: UnlistScopeChecked, enable: UnlistEnabled" />
+<<<<<<< HEAD
                                 <span>@NuGetScopes.Describe(NuGetScopes.PackageUnlist, Model.IsDeprecationApiEnabled)</span>
+=======
+                                <span>@NuGetScopes.Describe(NuGetScopes.PackageUnlist)</span>
+>>>>>>> b23f665fc ([UI] Add new themes to User pages (#9914))
                             </label>
                         </div>
                     </li>