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-09-27 00:26:29 -04:00
parent d3676ec3ab
commit 73d14137cd
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hourglass/client/profile/profile.js
View File

@ -76,12 +76,7 @@ Template.profile.helpers({
return Session.get("user").name; return Session.get("user").name;
}, },
motd() { // Returns the current user's description motd() { // Returns the current user's description
<<<<<<< HEAD
if (Session.get("user").description !== undefined && Session.get("user").description !== null) return Session.get("user").description; if (Session.get("user").description !== undefined && Session.get("user").description !== null) return Session.get("user").description;
=======
console.log(Session.get("user").description);
if (Session.get("user").description !== "") return Session.get("user").description;
>>>>>>> cc52ddc64bbeef3b2cf95c446e19577866096196
return "Say something about yourself!"; return "Say something about yourself!";
}, },
school() { // Returns the current user's school's name school() { // Returns the current user's school's name