diff options
| author | Hakaba Hitoyo <example@example.com> | 2018-02-04 08:36:10 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <example@example.com> | 2018-02-04 08:36:10 +0900 |
| commit | 013f11497fbc955bea6c182d64b512de2ee3bcdf (patch) | |
| tree | 6979bab5ddc02f68992cf8e71b4612e3f2b02d12 /src/components/user_settings/user_settings.vue | |
| parent | 95cba854f389ebdee200d0df147e4c26ed4949a0 (diff) | |
| parent | d97e6777ba849c9802da1e566d2baa2e1d7bdf70 (diff) | |
slove-conflict
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index da78cdc2..1ef52bbf 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -7,7 +7,7 @@ <div class="setting-item"> <h3>{{$t('settings.name_bio')}}</h3> <p>{{$t('settings.name')}}</p> - <input class='name-changer base03-border' id='username' v-model="newname" :value="user.screen_name"></input> + <input class='name-changer base03-border' id='username' v-model="newname"></input> <p>{{$t('settings.bio')}}</p> <textarea class="bio base03-border" v-model="newbio"></textarea> <button :disabled='newname.length <= 0' class="btn btn-default base05 base02-background" @click="updateProfile">{{$t('general.submit')}}</button> |