Fix conflicts for app/assets/javascripts/clusters/components/application_row.vue

app/assets/javascripts/clusters/components/application_row.vue

@@ -67,13 +67,8 @@
         // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
         // we already made a request to install and are just waiting for the real-time
         // to sync up.
-<<<<<<< HEAD
         return (this.status !== APPLICATION_INSTALLABLE &&
           this.status !== APPLICATION_ERROR) ||
-=======
-        return (this.status !== APPLICATION_INSTALLABLE
-          && this.status !== APPLICATION_ERROR) ||
->>>>>>> upstream/master
           this.requestStatus === REQUEST_LOADING ||
           this.requestStatus === REQUEST_SUCCESS;
       },