reset these snapshots in some hairbrained scheme to convince github t…

…here are no conflicts
getsentry · Apr 3, 2018 · 2da10dd · 2da10dd
1 parent ba063e5
commit 2da10dd
Show file tree

Hide file tree

Showing 19 changed files with 136 additions and 3,039 deletions.
diff --git a/tests/js/spec/views/__snapshots__/accountSubscriptions.spec.jsx.snap b/tests/js/spec/views/__snapshots__/accountSubscriptions.spec.jsx.snap
@@ -36,123 +36,6 @@ exports[`AccountSubscriptions renders empty 1`] = `
 `;
 
 exports[`AccountSubscriptions renders list and can toggle 1`] = `
-<<<<<<< HEAD
-=======
-.glamor-4 {
-  font-size: 14px;
-  box-shadow: inset 0 -1px 0;
-  margin: -20px 0 30px;
-}
-
-.glamor-2 {
-  box-sizing: border-box;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.glamor-0 {
-  font-size: 20px;
-  font-weight: bold;
-  margin: 20px 0;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-
-.glamor-6 {
-  line-height: 1.5;
-  margin-bottom: 30px;
-}
-
-.glamor-50 {
-  background: #fff;
-  border: 1px solid;
-  margin-bottom: NaNpx;
-  position: relative;
-}
-
-.glamor-18 {
-  font-size: 13px;
-  font-weight: 600;
-  text-transform: uppercase;
-  border-bottom: 1px solid;
-  border-radius: 0 0;
-  line-height: 1;
-  padding: 10px 20px;
-}
-
-.glamor-15 {
-  box-sizing: border-box;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  font-size: 13px;
-  font-weight: 600;
-  text-transform: uppercase;
-  border-bottom: 1px solid;
-  border-radius: 0 0;
-  line-height: 1;
-  padding: 10px 20px;
-}
-
-.glamor-32 {
-  box-sizing: border-box;
-  padding: 16px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  border-bottom: 1px solid;
-}
-
-.glamor-32:last-child {
-  border: 0;
-}
-
-.glamor-28 {
-  box-sizing: border-box;
-  width: 50%;
-  padding-right: 16px;
-}
-
-.glamor-22 {
-  font-size: 1.2em;
-}
-
-.glamor-24 {
-  font-size: 0.8em;
-  margin-top: 6px;
-}
-
-.glamor-26 {
-  font-size: 0.8em;
-  margin-top: 6px;
-}
-
-.glamor-30 {
-  box-sizing: border-box;
-}
-
->>>>>>> second commit
 <AccountSubscriptions>
   <SideEffect(DocumentTitle)
     title="Subscriptions - Sentry"
@@ -223,20 +106,20 @@ exports[`AccountSubscriptions renders list and can toggle 1`] = `
                 <PanelHeader>
                   <StyledPanelHeader>
                     <Component
-                      className="css-wxaapd-StyledPanelHeader css-zott9u0"
+                      className="css-1y7casb-StyledPanelHeader css-ma0kn80"
                     >
                       <Flex
                         align="center"
-                        className="css-wxaapd-StyledPanelHeader css-zott9u0"
+                        className="css-1y7casb-StyledPanelHeader css-ma0kn80"
                         justify="space-between"
                       >
                         <Base
                           align="center"
-                          className="css-zott9u0 css-1qscict"
+                          className="css-ma0kn80 css-1qsvam7"
                           justify="space-between"
                         >
                           <div
-                            className="css-zott9u0 css-1qscict"
+                            className="css-ma0kn80 css-1qsvam7"
                             is={null}
                           >
                             Subscription