chore: resolve conflict

Author: cdransf

packages/progress-bar/README.md

@@ -1,12 +1,3 @@
-<sp-alert-banner open variant="info">
-    <div class="spectrum-InLineAlert-header">
-        <span>Deprecated</span>
-    </div>
-    <div class="spectrum-InLineAlert-content">
-        The <code>over-background</code> attribute has been deprecated and will be removed in a future release. Use <code>static-color="white"</code> instead.
-    </div>
-</sp-alert-banner>
-
 ## Overview
 
 An `<sp-progress-bar>` is used to visually show the progression of a system operation such as downloading, uploading, processing, etc. By default, progress bars have a blue fill that shows the progress.

packages/progress-bar/package.json

@@ -71,6 +71,7 @@
     },
     "types": "./src/index.d.ts",
     "customElements": "custom-elements.json",
+    "deprecationNotice": "The over-background attribute has been deprecated and will be removed in a future release. Use static-color='white' instead.",
     "sideEffects": [
         "./sp-*.js",
         "./**/*.dev.js"

projects/documentation/content/_includes/partials/deprecation.njk

@@ -1,7 +1,7 @@
 <section
     class="deprecation-container"
 >
-<div id="deprecation" class="spectrum-InLineAlert spectrum-InLineAlert--negative">
+<div id="deprecation" class="spectrum-InLineAlert spectrum-InLineAlert--notice">
         <div class="spectrum-InLineAlert-header">
           Deprecation Warning
           <sp-icon-alert class="spectrum-InLineAlert-icon" dir="ltr" aria-hidden="true"></sp-icon-alert>