Fix conflicts with test branch changes

ragavvenkatesan / yann

This toolbox is support material for the book on CNN (http://www.convolution.network).

http://www.yann.network

Other

41 stars 27 forks source link

Fix conflicts with test branch changes #18

Closed JordanRushing closed 7 years ago

JordanRushing commented 7 years ago

This should resolve the conflicts presented in #17

ragavvenkatesan commented 7 years ago

I will accept this into the dev branch and test it. Before you commit changes just make sure that all the tutorial codes run. This is my way of testing the moment.

ragavvenkatesan commented 7 years ago

@JordanRushing I still have some conflicts in merging the test branch on to the dev branch. Are you sure you have the latest dev branch pull ?

JordanRushing commented 7 years ago

@ragavvenkatesan, I apologize sincerely about the conflicts and am working to resolve now