Egonor
commented
2 years ago You need to 'git pull' changes and fix conflicts before this can be merged. There were changes made to the dev branch and they're not reflected in your code which is why this is happening.
The only real issue I see is in urls.py where there are two different imports for views, but I didn't work on either of those so I can't say which one is necessary/correct.
search function works, still working on opening the pdf file.