From bd913c626b8aaf813b91dfbf661ab9090013de94 Mon Sep 17 00:00:00 2001 From: agu3rra Date: Tue, 13 Feb 2024 10:11:33 -0300 Subject: [PATCH] conflicts solved --- README.md | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index c4fc745..46b913a 100644 --- a/README.md +++ b/README.md @@ -157,42 +157,24 @@ poetry install 5. Run the `setup-aliases.sh` to add the commands as aliases in your OS. It should update both `~/.bashrc` and `/.zshrc` if they are present in your file system. ```bash -<<<<<<< HEAD ./setup-aliases.sh -======= -# Tell your shell how to find the `fabric` client -echo 'alias fabric="python3 /the/path/to/fabric/client/fabric/fabric.py"' >> ~/.bashrc -# Example of ~/.zshrc or ~/.bashrc -alias fabric="python3 ~/Development/fabric/client/fabric/fabric.py" ->>>>>>> main ``` 6. Restart your shell -<<<<<<< HEAD -6. Setup your `OPENAI_API_KEY`. +7. Setup your `OPENAI_API_KEY`. ```bash export OPENAI_API_KEY=foobar ``` -7. Check if all command line applications can execute +8. Check if all command line applications can execute ```bash # Make sure you can fabric --help fabric-api fabric-webui -======= -Restart your shell via 'bash'. -Enter the poetry shell for access to the installed dependencies. - -```bash -# Make sure you can access the help description via the shell -poetry shell -# Example -fabric -h ->>>>>>> main ``` PS: If you're using the `server` functions, `fabric-api` and `fabric-webui` need to be run in dictinct terminal windows.