sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-27 17:35:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve merge conflict in chat.html

Browse source
This commit is contained in:
sabaimran 2024-04-02 17:29:48 +05:30
parent bf1187f465
commit f48426623d
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/khoj/interface/web/chat.html
View file

@ -20,13 +20,8 @@ Hi, I am Khoj, your open, personal AI 👋🏽. I can:
- 🌄 Generate images based on your messages
- 🔎 Search the web for answers to your questions
- 🎙️ Listen to your audio messages (use the mic by the input box to speak your message)
<<<<<<< HEAD
- 📚 Understand files you drag & drop here
||||||| 7416ca9a
=======
- 📚 Understand files you drag & drop here
- 👩🏾‍🚀 Be tuned to your conversation needs via [agents](./agents)
>>>>>>> 3c3e48b18c87a42e3b69af5dbfb86b5c8b68effa
Get the Khoj [Desktop](https://khoj.dev/downloads), [Obsidian](https://docs.khoj.dev/clients/obsidian#setup), [Emacs](https://docs.khoj.dev/clients/emacs#setup) apps to search, chat with your 🖥️ computer docs. You can manage all the files you've shared with me at any time by going to [your settings](/config/content-source/computer/).