1 files changed, 0 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index d55d5cfbca5..835364b2990 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -34,16 +34,12 @@ $error-exclamation-point: #E62958;
 $border-radius-default: 3px;
 $list-title-color: #333333;
 $list-text-color: #555555;
-$profile-settings-link-color: $md-link-color;
 
 $btn-transparent-color: #8F8F8F;
 
 $ssh-key-icon-color: #8F8F8F;
 $ssh-key-icon-size: 18px;
 
-$change-username-title-color: #FC6D26;
-$remove-account-title-color: #F00;
-
 $provider-btn-group-border: #E5E5E5;
 $provider-btn-not-active-color: #4688F1;
 
@@ -104,14 +100,8 @@ $border-red-light: #F24F41;
 $border-red-normal: #D22852;
 $border-red-dark: #CA264F;
 
-<<<<<<< 454832ace49f1b1742b380441817663051ba8ac8
 $help-well-bg: #FAFAFA;
 $help-well-border: #E5E5E5;
-=======
-$account-well-bg: #FAFAFA;
-$account-well-border: #E5E5E5;
-$account-well-radius: 3px;
->>>>>>> Fixed heading weight issue
 
 /* header */
 $light-grey-header: #faf9f9;