Skip to content

Commit 1d07f56

Browse files
committed
Tidied up a couple of issues from the copier update.
1 parent 0b36b4b commit 1d07f56

3 files changed

Lines changed: 1 addition & 9 deletions

File tree

.github/workflows/docs.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,10 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515
- uses: actions-ext/python/setup@main
16-
<<<<<<< before updating
1716
- run: |
1817
sudo apt-get update
1918
sudo apt-get install -y libldap2-dev libssl-dev libsasl2-dev
20-
- run: uv pip install .
21-
=======
2219
- run: uv pip install .[develop]
23-
>>>>>>> after updating
2420
- run: uv pip install yardang
2521
- run: yardang build
2622
- uses: peaceiris/actions-gh-pages@v4

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ Tool for managing staff teaching time.
77
[![License](https://img.shields.io/github/license/Southampton-RSG/physics-workload)](https://github.com/Southampton-RSG/physics-workload)
88
[![PyPI](https://img.shields.io/pypi/v/physics-workload.svg)](https://pypi.python.org/pypi/physics-workload)
99

10-
11-
<<<<<<< before updating
1210
## Installation
1311

1412
Clone the repo to the server:
@@ -59,7 +57,5 @@ sudo docker compose up web
5957

6058
# Extra
6159

62-
=======
63-
>>>>>>> after updating
6460
> [!NOTE]
6561
> This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
dockerfile: Dockerfile
3535
context: .
3636
ports:
37-
- "8000:8000"
37+
- "8008:8000"
3838
env_file:
3939
- "./.env.default"
4040
- "./.env"

0 commit comments

Comments
 (0)