Skip to content
Snippets Groups Projects
Commit c3dc1424 authored by Mohammed Shorif's avatar Mohammed Shorif
Browse files

Testing merge conflict.

parent 1d0ec983
No related branches found
No related tags found
1 merge request!33Testing merge conflict.
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
static/make_booking.css
+ 1
− 0
View file @ c3dc1424
......@@ -3,6 +3,7 @@
width: 30%;
}
h1 {
color: black;
font-family: arial, sans-serif;
......
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