Skip to content
Snippets Groups Projects
Commit a55e3d90 authored by Arianne Bayliss's avatar Arianne Bayliss
Browse files

Merge branch... 

Merge branch '15-as-a-user-i-want-to-find-out-what-tramshed-is-so-that-i-can-access-their-working-spaces' into 'development'

Resolve "As a user I want to find out what Tramshed is so that I can access their working spaces"

Closes #15

See merge request !8
parents 549e4ae7 29342b40
No related branches found
No related tags found
2 merge requests!20Draft: resolving merge conflicts,!8Resolve "As a user I want to find out what Tramshed is so that I can access their working spaces"
Hide whitespace changes
Inline Side-by-side
landingpage.html 0 → 100644
+ 9
− 0
View file @ a55e3d90
<html>
<head><link rel="stylesheet" href="style.css"></head>
<header>
<img src="logo.jpg"/><br><br><br><br>
</header>
<body class="body">
<img src="title.png"/>
<button id= "ViewLocations" type="ViewLocations" href="locations.html">View Locations</button>
</html>
css_framework.css → style.css
+ 0
− 0
View file @ a55e3d90
File moved
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment