From c3dc14240e6bc2a6cb6825c33a5568ddf13c183d Mon Sep 17 00:00:00 2001
From: Mohammed Shorif <shorifm@cardiff.ac.uk>
Date: Fri, 2 Dec 2022 12:34:02 +0000
Subject: [PATCH] Testing merge conflict.
---
static/make_booking.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/static/make_booking.css b/static/make_booking.css
index 37b226f..34bb55e 100644
--- a/static/make_booking.css
+++ b/static/make_booking.css
@@ -3,6 +3,7 @@
width: 30%;
}
+
h1 {
color: black;
font-family: arial, sans-serif;
--
GitLab