Update validation error message string.

Fixup: resolve merge conflict with sass

openassessment/xblock/static/js/src/studio/oa_edit.js

@@ -136,8 +136,8 @@ OpenAssessment.StudioView.prototype = {
         this.clearValidationErrors();
         if (!this.validate()) {
             this.validationAlert.setMessage(
-                gettext("Validation Errors"),
-                gettext("Some fields are not valid.  Please update the fields.")
+                gettext("Couldn't Save This Assignment"),
+                gettext("Please correct the outlined fields.")
             ).show();
         }
         else {

openassessment/xblock/static/sass/oa/utilities/_developer.scss

@@ -494,81 +494,6 @@
 
   #oa_rubric_editor_wrapper{
 
-<<<<<<< HEAD
-=======
-    #openassessment_rubric_validation_alert{
-      height: auto;
-      width: 100%;
-      border-top-left-radius: 2px;
-      border-top-right-radius: 2px;
-      background-color: #323232;
-      border-bottom: 3px solid rgb(192, 172, 0);
-      padding: 10px;
-      position: absolute;
-      z-index: 10;
-      min-height: 70px;
-      @include transition (color 0.50s ease-in-out 0s);
-
-      .openassessment_alert_icon:before{
-        font-family: FontAwesome;
-        content: "\f071";
-        display: inline-block;
-        color: rgb(192, 172, 0);
-        float: left;
-        font-size: 200%;
-        margin: 1.5% 0px 0px 2%;
-      }
-      .openassessment_alert_header {
-        width: 85%;
-        margin: 0 5% 0 10%;
-
-        .openassessment_alert_title {
-          width: auto;
-          color: white;
-        }
-
-        .openassessment_alert_message {
-          font-size: 80%;
-          color: darkgray;
-        }
-      }
-
-      // with cancel
-      .openassessment_alert_close {
-        display: inline-block;
-        position: absolute;
-        top: 0px;
-        right: 0px;
-        color: #e9e9e9;
-        background-color: #323232;
-        text-align: center;
-        margin: 5px 10px;
-
-        [class^="icon"] {
-          width: auto;
-          margin: 0;
-          padding: 2px;
-        }
-
-        &:hover {
-          color: $blue;
-        }
-      }
-    }
-
-    #openassessment_rubric_content_editor{
-      height: 100%;
-      width: 100%;
-      overflow-y: scroll;
-    }
-
-    #openassessment_rubric_content_editor.openassessment_alert_shown{
-      height: Calc(100% - 70px);
-      position: absolute;
-      bottom: 0;
-    }
-
->>>>>>> origin/authoring
     .wrapper-comp-settings{
       display: block;
     }