PYROS-IRAP / pyros

Commit 8ec579f0f64ac24b89ffb3079839d7c789b6530b

Authored by Alexis Koralewski
1 parent 1ffd216f
Exists in dev

merge dockerfile

Showing 1 changed file with 0 additions and 5 deletions   Show diff stats
Inline Side-by-side
Dockerfile
  Diff comments   View file @8ec579f
... ... @@ -207,8 +207,3 @@ RUN python3.10 -m pip install --user -r ./vendor/guitastro/install/requirements
207 207 # Installing packages required for PyROS
208 208 RUN python3.10 -m pip install --user -r ./install/requirements.txt
209 209 RUN python3.10 -m pip install --user -r ./install/requirements_dev.txt
210   -<<<<<<< HEAD
211   -
212   -WORKDIR /home/pyros_user/app/pyros
213   -=======
214   ->>>>>>> 7fd005b5084f436737a15b421bcd36e85fcb5a8f
... ...