Skip to content
Snippets Groups Projects

Testing merge conflict.

Merged Testing merge conflict.
18-as-a-user-i-want-to-be-able-to-create-a-booking into development
Merged Mohammed Shorif requested to merge 18-as-a-user-i-want-to-be-able-to-create-a-booking into development
Compare
and
1 file
+ 1
− 0
Compare changes
  • Side-by-side
  • Inline
static/make_booking.css
+ 1
− 0
@@ -3,6 +3,7 @@
@@ -3,6 +3,7 @@
width: 30%;
width: 30%;
}
}
 
h1 {
h1 {
color: black;
color: black;
font-family: arial, sans-serif;
font-family: arial, sans-serif;