solved conflict (c294eccc) · Commits · osp / tools.cobbled-paths · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tools.cobbled-paths
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c294eccc

Commit c294eccc authored 9 months ago by Doriane

Downloads
- Plain Diff

solved conflict

parents 60ff896f 08811607

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

README.md 39 additions, 2 deletions

README.md
app.py 26 additions, 10 deletions

app.py
requirements.txt 0 additions, 1 deletion

requirements.txt
scripts/make_flf.py 30 additions, 0 deletions

scripts/make_flf.py
templates/drawing.html 24 additions, 2 deletions

templates/drawing.html
templates/writing.html 23 additions, 1 deletion

templates/writing.html

with 142 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment