kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Kenneth Jao 2016-08-18 18:53:03 -04:00
parent 80459a006b
commit 444ecc5029
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hourglass/client/main/main.js
View File

@ -85,22 +85,14 @@ Template.registerHelper('myClasses', () => {
array[i].thisClassWork = thisWork; array[i].thisClassWork = thisWork;
} }
Session.set("noclass",false); Session.set("noclass",false);
<<<<<<< HEAD
console.log(array);
return array; return array;
=======
return array;
>>>>>>> afd60acb9ab69a32ee86ae92e86e0d67e39af7be
} }
}); });
Template.main.helpers({ Template.main.helpers({
schoolName() { schoolName() {
<<<<<<< HEAD
Session.set("calendarclasses", Meteor.user().profile.classes); Session.set("calendarclasses", Meteor.user().profile.classes);
=======
Session.set("calendarclasses", Meteor.user().profile.classes);
>>>>>>> afd60acb9ab69a32ee86ae92e86e0d67e39af7be
return " - " + Meteor.user().profile.school; return " - " + Meteor.user().profile.school;
}, },
iconColor(icon) { iconColor(icon) {