Resolving merge issues

diff --git a/css/mock1.css b/css/mock1.css
index a6ec32bdc41583582502cf0755f73ebcef0ac778..81de76dbcb53666e4d2396d86379a847319c54a9 100644 (file)
--- a/css/mock1.css
+++ b/css/mock1.css
@@ -229,10 +229,7 @@ a.hchild:hover,a.hchild:active {
 .footer {
     background: var(--jumbotron-bg);
     color: rgba(var(--footer-text-color),.9);
-<<<<<<< HEAD
     margin-top: 2vh;
-=======
->>>>>>> 76fe2571937371940ac0e6a9e43561bbe25dafc5
     display: flex;
     flex-wrap: nowrap;
     min-height: 27vh;