Skip to content

Commit 48ec198

Browse files
committed
resolve merge conflict
2 parents 97539c4 + 93d787e commit 48ec198

19 files changed

+349
-8169
lines changed

README.md

Lines changed: 349 additions & 345 deletions
Large diffs are not rendered by default.

examples/Copy_of_mafat_final.ipynb

Lines changed: 0 additions & 7824 deletions
This file was deleted.
File renamed without changes.

gallery/coco_thumbnail.jpg

-99.6 KB
Loading

gallery/dino.png

-612 KB
Binary file not shown.

gallery/dino_thumbnail.jpg

29 KB
Loading

gallery/feature_vector.jpg

27.8 KB
Loading

gallery/feature_vector.png

-36.2 KB
Binary file not shown.

gallery/food_101_thumbnail.jpg

-705 KB
Binary file not shown.

gallery/food_thumbnail.jpg

24.1 KB
Loading

0 commit comments

Comments
 (0)