Skip to content

Commit 7261843

Browse files
fix rebase issue
1 parent 3d66cdc commit 7261843

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/components/tutor/FirstStep.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,9 @@ const removeLastInputFile = () => {
111111
class="input"
112112
type="file"
113113
accept="application/pdf, text/*"
114-
<<<<<<< HEAD
115114
placeholder="Enter the new file"
116115
data-testid="file-input"
117-
@change="addFile"
118-
||||||| parent of aeaf9fa (feat(tutor): fix how files are handled when added, removed, replaced)
119-
placeholder="Enter the name of the file"
120-
@change="addFile"
121-
=======
122-
placeholder="Enter the name of the file"
123116
@change="(e) => addFile(e, 'file_0')"
124-
>>>>>>> aeaf9fa (feat(tutor): fix how files are handled when added, removed, replaced)
125117
/>
126118
<button ref="deleteButtonRef" class="button" @click="removeFirstChild">x</button>
127119
</div>

0 commit comments

Comments
 (0)