Fixing conflicts. (3e72d4a1) · Commits · Arianne Bayliss / ProjectClient_Y1S1_tramshedTech_team15 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

ProjectClient_Y1S1_tramshedTech_team15
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

3e72d4a1

Commit 3e72d4a1 authored 2 years ago by Zainab Almeshari

Downloads
- Patches
- Plain Diff

Fixing conflicts.

parent fc0751cb

No related branches found

No related tags found

1 merge request!52Fixing conflicts.

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

static/CSS/Manage_Coworking_Spaces.css 90 additions, 32 deletions

static/CSS/Manage_Coworking_Spaces.css
static/CSS/locations.css 45 additions, 18 deletions

static/CSS/locations.css
static/locations.html 62 additions, 16 deletions

static/locations.html
templates/ListLocations.html 21 additions, 3 deletions

templates/ListLocations.html
templates/Manage_Coworking_Spaces.html 0 additions, 1 deletion

templates/Manage_Coworking_Spaces.html
templates/base_template.html 1 addition, 0 deletions

templates/base_template.html

with 219 additions and 70 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