search

classtranscribe / FrontEnd

The React + Redux Frontend for ClassTranscribe
https://classtranscribe.illinois.edu
Other
25 stars 27 forks source link

Added video clip feature to edit inote page #684

Closed meg-ghana closed 9 months ago

angrave commented 9 months ago

@sujitv19196 @meg-ghana is it obvious to either of you have to correctly resolve this merge conflict? (I don't want to lose any useful functionality by just guessing)

meg-ghana commented 9 months ago

@sujitv19196 @meg-ghana is it obvious to either of you have to correctly resolve this merge conflict? (I don't want to lose any useful functionality by just guessing)

I made a new commit with the merge conflict resolved