Cannot merge
This branch has merge conflicts in the following files:
  • .gitignore
  • Dockerfile
  • README.md
  • app.py
  • check_proxy.py
  • colorful.py
  • config.py
  • core_functional.py
  • crazy_functional.py
  • crazy_functions/Latex全文润色.py
  • crazy_functions/Latex全文翻译.py
  • crazy_functions/crazy_utils.py
  • crazy_functions/下载arxiv论文翻译摘要.py
  • crazy_functions/代码重写为全英文_多线程.py
  • crazy_functions/总结word文档.py
  • crazy_functions/批量总结PDF文档.py
  • crazy_functions/批量总结PDF文档pdfminer.py
  • crazy_functions/批量翻译PDF文档_多线程.py
  • crazy_functions/理解PDF文档内容.py
  • crazy_functions/生成函数注释.py
  • crazy_functions/解析项目源代码.py
  • crazy_functions/读文章写摘要.py
  • crazy_functions/谷歌检索小助手.py
  • crazy_functions/高级功能函数模板.py
  • requirements.txt
  • theme.py
  • toolbox.py
  • version

Sign up or log in to comment