diff options
| author | Hakaba Hitoyo <example@example.com> | 2018-02-10 10:17:58 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <example@example.com> | 2018-02-10 10:17:58 +0900 |
| commit | ebd8300e36be1af75a093264e77a9ba317a605cd (patch) | |
| tree | 670c8eb61d36459eb6573f64091178d5c0a737ba /src/components/timeline/timeline.vue | |
| parent | f23940a153b501f5edaecd292ebf2c7b9345d33f (diff) | |
| parent | b0f248c48384c888faef8fcf76ee8b3f8abfde8e (diff) | |
slove conflict
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 9d2e1ea1..d6ecfd2f 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -32,7 +32,7 @@ </div> <div class="panel-body base01-background"> <div class="timeline"> - <user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card> + <user-card v-for="follower in followers" :key="follower.id" :user="follower" :showFollows="false"></user-card> </div> </div> </div> @@ -44,7 +44,7 @@ </div> <div class="panel-body base01-background"> <div class="timeline"> - <user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card> + <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card> </div> </div> </div> |