Skip to content

Commit 5ed0bc1

Browse files
committed
Fixed merge conflicts
1 parent 09f83ba commit 5ed0bc1

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

resources/dist/build/assets/statamic-content-usage-SMn7H5cg.js renamed to resources/dist/build/assets/statamic-content-usage-BsSizaXU.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/dist/build/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"isEntry": true
1010
},
1111
"resources/js/statamic-content-usage.js": {
12-
"file": "assets/statamic-content-usage-SMn7H5cg.js",
12+
"file": "assets/statamic-content-usage-BsSizaXU.js",
1313
"name": "statamic-content-usage",
1414
"src": "resources/js/statamic-content-usage.js",
1515
"isEntry": true

resources/js/components/widgets/EntryUsageWidget.vue

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<Select
1212
v-model="selectedCollection"
1313
:options="collectionOptions"
14+
:placeholder="selectCollectionLabel"
1415
/>
1516
</div>
1617

@@ -86,13 +87,10 @@ const {
8687
const selectedCollection = ref(null);
8788
const exportType = ref('used');
8889
89-
const collectionOptions = computed(() => [
90-
{ value: '', label: selectCollectionLabel },
91-
...collections.map((collection) => ({
92-
value: collection.handle,
93-
label: collection.title,
94-
})),
95-
]);
90+
const collectionOptions = computed(() => collections.map((collection) => ({
91+
value: collection.handle,
92+
label: collection.title,
93+
})));
9694
9795
const exportTypeOptions = computed(() => [
9896
{ value: 'used', label: exportUsedLabel },

0 commit comments

Comments
 (0)