...

Author: cazetto

src/dashboard/Dashboard.js

@@ -204,17 +204,9 @@ class Dashboard extends React.Component {
       });
       return Parse.Promise.when(appInfoPromises);
     }).then(function(resolvedApps) {
-<<<<<<< HEAD
-      if(resolvedApps && resolvedApps.length) {
-        resolvedApps.forEach(app => {
-          AppsManager.addApp(app);
-        });
-      }
-=======
       resolvedApps.forEach(app => {
         AppsManager.addApp(app);
       });
->>>>>>> apps-notification
       this.setState({ configLoadingState: AsyncStatus.SUCCESS });
     }.bind(this)).fail(({ error }) => {
       this.setState({

src/dashboard/Data/Jobs/Jobs.react.js

@@ -59,7 +59,7 @@ function scheduleString(data) {
 }
 
 // TODO: create scrollable view component that handles lazy fetch container on scroll
-@subscribeTo('Jobs', 'jobss')
+@subscribeTo('Jobs', 'jobs')
 export default class Jobs extends TableView {
   constructor() {
     super();