search

jtr13 / cc21fall1

Source files for EDAV Fall 2021 Mon / Wed Community Contribution Project
https://jtr13.github.io/cc21fall1
4 stars 67 forks source link

Deeplearningr new pull request #46

Closed Dashansh closed 2 years ago

Shruti-Kaushal commented 2 years ago

Could you take a look at this @s10singh97

s10singh97 commented 2 years ago

@Shruti-Kaushal Looks good to me! Please update their _bookdown.yml file before merging.

jtr13 commented 2 years ago

I'm not sure why but you ended up with "complex" conflicts:

image

I'll take a look later today and try to resolve it locally.

jtr13 commented 2 years ago

@Shruti-Kaushal It should work now. The changes I made locally were the same as what we usually do so I still don't know why it was flagged as a "complex" conflict.

Shruti-Kaushal commented 2 years ago

Thank you professor for resolving it!

On Sun, Nov 7, 2021 at 6:26 PM Joyce Robbins @.***> wrote:

@Shruti-Kaushal https://github.com/Shruti-Kaushal It should work now. The changes I made locally were the same as what we usually do so I still don't know why it was flagged as a "complex" conflict.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/jtr13/cc21fall1/pull/46#issuecomment-962701709, or unsubscribe https://github.com/notifications/unsubscribe-auth/ANEQ5RZFN2C3WYSR7W4WULLUK4DLTANCNFSM5HOLMZCA . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub.

-- Shruti Kaushal Columbia University, MS in Data Science Indian Institute of Technology Delhi, MS in Mathematics www.linkedin.com/in/shrutikaushal @.*** (209) 302-9950

jtr13 commented 2 years ago

Thanks for your contribution! 🎉