diff options
| author | navanchauhan <navanchauhan@gmail.com> | 2022-05-22 12:20:59 -0600 |
|---|---|---|
| committer | navanchauhan <navanchauhan@gmail.com> | 2022-05-22 12:20:59 -0600 |
| commit | 6e29717df1f825e47ea39970a94a94e6bf467439 (patch) | |
| tree | cf7b29e2e7822a0c83310cf9a63bcf65365c8ef9 /Resources | |
| parent | 798dd3c615945974bef6beec056efda78946489a (diff) | |
| parent | 034d155d8ea9019e651056662f501b4c79e09883 (diff) | |
fixing conflicts
Diffstat (limited to 'Resources')
| -rw-r--r-- | Resources/assets/flixrec/filter.png | bin | 0 -> 242231 bytes |
| -rw-r--r-- | Resources/assets/flixrec/home.png | bin | 0 -> 160255 bytes |
| -rw-r--r-- | Resources/assets/flixrec/multiple.png | bin | 0 -> 251294 bytes |
| -rw-r--r-- | Resources/assets/flixrec/results.png | bin | 0 -> 280362 bytes |
| -rw-r--r-- | Resources/assets/résumé.pdf | bin | 84216 -> 0 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/Resources/assets/flixrec/filter.png b/Resources/assets/flixrec/filter.png Binary files differnew file mode 100644 index 0000000..c1e4c52 --- /dev/null +++ b/Resources/assets/flixrec/filter.png diff --git a/Resources/assets/flixrec/home.png b/Resources/assets/flixrec/home.png Binary files differnew file mode 100644 index 0000000..2d6fb51 --- /dev/null +++ b/Resources/assets/flixrec/home.png diff --git a/Resources/assets/flixrec/multiple.png b/Resources/assets/flixrec/multiple.png Binary files differnew file mode 100644 index 0000000..f35d342 --- /dev/null +++ b/Resources/assets/flixrec/multiple.png diff --git a/Resources/assets/flixrec/results.png b/Resources/assets/flixrec/results.png Binary files differnew file mode 100644 index 0000000..a239ba4 --- /dev/null +++ b/Resources/assets/flixrec/results.png diff --git a/Resources/assets/résumé.pdf b/Resources/assets/résumé.pdf Binary files differdeleted file mode 100644 index 8931b18..0000000 --- a/Resources/assets/résumé.pdf +++ /dev/null |
