conflict whem merging xenofem changes

2020-06-29 15:03:51 +03:00 · 2020-06-29 15:03:51 +03:00 · 8c2335f84f
commit 8c2335f84f
parent 96d2c86d3b 529d72c297
1 changed files with 1 additions and 1 deletions
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -255,7 +255,7 @@
            v-model="newStatus.mediaDescriptions[file.id]"
            type="text"
            :placeholder="$t('post_status.media_description')"
-            @keydown.prevent.enter=""
+            @keydown.enter.prevent=""
          >
        </div>
      </div>