search

classtranscribe / FrontEnd

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

Expt edit inote addimagetextusingchapteridx #657

Closed alan3tao closed 11 months ago

alan3tao commented 12 months ago

passing in chidx as parameter to data_reducer.js functions

sujitv19196 commented 11 months ago

@alan3tao Please resolve the merge conflict

sujitv19196 commented 11 months ago

Not sure why you created a new branch (expt-edit-inote-addimagetextusingchapteridx) instead of just working off of the original one which I pushed my changes to (expt-edit-inote-addimagetext).

Not a big deal but it would have been easier to just have both of us work off one branch instead of making a new one. It also allows us to more clearly see the commit history.