fix other merge conflict errors

client/constants.js

@@ -130,6 +130,3 @@ export const HIDE_HELP_MODAL = 'HIDE_HELP_MODAL';
 export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING';
 export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING';
 export const SET_ASSETS = 'SET_ASSETS';
-
-export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING';
-export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING';

client/modules/IDE/components/Editor.jsx

@@ -69,7 +69,7 @@ class Editor extends React.Component {
     this.findNext = this.findNext.bind(this);
     this.findPrev = this.findPrev.bind(this);
   }
-  
+
   componentDidMount() {
     this.beep = new Audio(beepUrl);
     this.widgets = [];

client/modules/IDE/pages/IDEView.jsx

@@ -690,13 +690,10 @@ IDEView.propTypes = {
   persistState: PropTypes.func.isRequired,
   showHelpModal: PropTypes.func.isRequired,
   hideHelpModal: PropTypes.func.isRequired,
-<<<<<<< HEAD
   showRuntimeErrorWarning: PropTypes.func.isRequired,
-  hideRuntimeErrorWarning: PropTypes.func.isRequired
-=======
+  hideRuntimeErrorWarning: PropTypes.func.isRequired,
   startSketch: PropTypes.func.isRequired,
   startAccessibleSketch: PropTypes.func.isRequired
->>>>>>> master
 };
 
 function mapStateToProps(state) {

client/styles/components/_editor.scss

@@ -27,31 +27,6 @@ pre.CodeMirror-line {
 	padding-left: #{5 / $base-font-size}rem;
 }
 
-.CodeMirror-activeline-background {
-  background-color: rgba(0,0,0,0.025) !important;
-}
-
-.CodeMirror-linebackground {
-  
-}
-
-.line-runtime-error {
-  background-color: #ffaaaa !important;
-  border-radius: 5px;
-}
-
-.CodeMirror-guttermarker-subtle {
-  
-}
-
-.CodeMirror-foldgutter-folded {
-  
-}
-
-.CodeMirror-foldgutter-open {
-  
-}
-
 .CodeMirror-gutter-wrapper {
   right: 100%;
   top: 0;