[CE->EE] Resove frontent conflicts

app/assets/javascripts/notes.js

@@ -20,12 +20,8 @@ import Flash from './flash';
 import CommentTypeToggle from './comment_type_toggle';
 import GLForm from './gl_form';
 import loadAwardsHandler from './awards_handler';
-<<<<<<< HEAD
-import './autosave';
-=======
 import Autosave from './autosave';
 import './dropzone_input';
->>>>>>> 1c317af47772ed2862a9c1ed22ab952bb1a84874
 import TaskList from './task_list';
 import { ajaxPost, isInViewport, getPagePath, scrollToElement, isMetaKey } from './lib/utils/common_utils';
 import imageDiffHelper from './image_diff/helpers/index';

app/assets/stylesheets/framework/contextual-sidebar.scss

-<<<<<<< HEAD:app/assets/stylesheets/framework/new-sidebar.scss
-@import "framework/variables";
-@import 'framework/tw_bootstrap_variables';
-@import "bootstrap/variables";
-
-$active-background: rgba(0, 0, 0, .04);
-$active-hover-background: $active-background;
-$active-hover-color: $gl-text-color;
-$inactive-badge-background: rgba(0, 0, 0, .08);
-$hover-background: rgba(0, 0, 0, .06);
-$hover-color: $gl-text-color;
-$inactive-color: $gl-text-color-secondary;
-$new-sidebar-width: 220px;
-$new-sidebar-collapsed-width: 50px;
-
-.page-with-new-sidebar {
-=======
 .page-with-contextual-sidebar {
->>>>>>> 1c317af47772ed2862a9c1ed22ab952bb1a84874:app/assets/stylesheets/framework/contextual-sidebar.scss
   @media (min-width: $screen-md-min) {
     padding-left: $contextual-sidebar-collapsed-width;
   }
@@ -334,11 +316,7 @@ $new-sidebar-collapsed-width: 50px;
 
     &.active > a:hover,
     &.is-over > a {
-<<<<<<< HEAD:app/assets/stylesheets/framework/new-sidebar.scss
-      background-color: $hover-background;
-=======
       background-color: $link-hover-background;
->>>>>>> 1c317af47772ed2862a9c1ed22ab952bb1a84874:app/assets/stylesheets/framework/contextual-sidebar.scss
     }
   }
 }