Skip to content

Commit aba940f

Browse files
Remove merge comments
- Remove comment lines from earlier merge
1 parent c8b1f58 commit aba940f

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

src/components/Lesson.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,8 @@ export default {
178178
parsedExercise: marked(self.$attrs.exercise || ''),
179179
parsedConcepts: marked(self.$attrs.concepts || ''),
180180
lessonTitle: self.$attrs.lessonTitle,
181-
<<<<<<< HEAD
182181
issueUrl: `https://github.com/ipfs-shipyard/proto.school/issues/new?labels=question&title=Question+on+Lesson+${self.$route.path.slice(self.$route.path.lastIndexOf('/') + 1)}:+${self.$attrs.lessonTitle}+(${self.$route.path})&body=Have%20a%20question%20or%20suggestion%20regarding%20a%20ProtoSchool%20lesson%3F%20Please%20use%20this%0Atemplate%20to%20share%20it!%0A%0A1.%20URL%20of%20the%20lesson%20that's%20confusing%3A%0A%20https%3A%2F%2Fproto.school%2F%23${self.$route.path}%0A%0A2.%20What%27s%20confusing%20about%20this%20lesson%3F%0A%0A3.%20What%20additional%20context%20could%20we%20provide%20to%20help%20you%20succeed%3F%0A%0A4.%20What%20other%20feedback%20would%20you%20like%20to%20share%20about%20ProtoSchool%3F%0A`,
183-
=======
184182
output: self.output,
185-
>>>>>>> master
186183
IPFS,
187184
expandExercise: false,
188185
options: {

0 commit comments

Comments
 (0)