diff options
| author | dave <starpumadev@gmail.com> | 2019-04-01 12:13:11 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-04-01 12:13:11 -0400 |
| commit | 0af2f8e4fd399100a0034137ab26c6742db43639 (patch) | |
| tree | 1e425c67e3168a9bc357aa4f9b66911938e119d4 /src/components/user_profile/user_profile.js | |
| parent | 21ea5adc8b4f8eb16026cdefd60a60c8952ae162 (diff) | |
| parent | 6c24ae9b0be25becc453cd62ba78b955c5fb6c70 (diff) | |
#436 - merge develop & resolve conflict
Diffstat (limited to 'src/components/user_profile/user_profile.js')
| -rw-r--r-- | src/components/user_profile/user_profile.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 82df4510..1df06fe6 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -72,9 +72,6 @@ const UserProfile = { return this.$store.getters.findUser(this.fetchedUserId || routeParams.name || routeParams.id) }, user () { - if (this.timeline.statuses[0]) { - return this.timeline.statuses[0].user - } if (this.userInStore) { return this.userInStore } |