aboutsummaryrefslogtreecommitdiff
path: root/src/components/media_upload/media_upload.vue
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2022-08-01 18:17:09 -0600
committerSean King <seanking2919@protonmail.com>2022-08-01 18:17:09 -0600
commit081aa0fd0552732f208bd35e37cde06c66536791 (patch)
tree053827cd9d9b258d6752195ab09eabd37d4c813b /src/components/media_upload/media_upload.vue
parent75216c5feb32b32e24952663ffa4233410585785 (diff)
parent3fc9673a7d0fb851283e4ed687c2fd7790f03317 (diff)
Fix merge conflicts
Diffstat (limited to 'src/components/media_upload/media_upload.vue')
-rw-r--r--src/components/media_upload/media_upload.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 7cc59f5a..a538a5ed 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -26,7 +26,7 @@
</label>
</template>
-<script src="./media_upload.js" ></script>
+<script src="./media_upload.js"></script>
<style lang="scss">
@import '../../_variables.scss';