Resolve conflicts

This commit is contained in:
oobabooga 2023-09-21 17:45:11 -07:00
parent df39f455ad
commit 193fe18c8c
3 changed files with 0 additions and 44 deletions

View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
# Text generation web UI
A Gradio web UI for Large Language Models.
@ -391,20 +390,3 @@ If you would like to contribute to the project, check out the [Contributing guid
## Acknowledgment
In August 2023, [Andreessen Horowitz](https://a16z.com/) (a16z) provided a generous grant to encourage and support my independent work on this project. I am **extremely** grateful for their trust and recognition, which will allow me to dedicate more time towards realizing the full potential of text-generation-webui.
=======
# One-click installers
These are automated installers for [oobabooga/text-generation-webui](https://github.com/oobabooga/text-generation-webui).
The idea is to allow people to use the program without having to type commands in the terminal, thus making it more accessible.
## How it works
The `start` scripts download miniconda, create a conda environment inside the current folder, and then install the webui using that environment.
After the initial installation, the `update` scripts are then used to automatically pull the latest text-generation-webui code and upgrade its requirements.
## Limitations
* The start/update scripts themselves are not automatically updated. To update them, you have to re-download the zips listed on the [main README](https://github.com/oobabooga/text-generation-webui#one-click-installers) and overwrite your existing files.
>>>>>>> second-repo/main