styling and fotn file change

2 months ago · 95a501ec42
parent b2f6dde83b
commit 95a501ec42
1 changed files with 0 additions and 3 deletions
--- a/print.css
+++ b/print.css
@ -42,12 +42,9 @@ mark {
  display: block;
  padding-left: 0.5cm;
  font-family: "DuctusRegular";
-<<<<<<< HEAD
  margin-bottom: 1cm;
  margin-right: 1cm;
-=======
  white-space: normal;
->>>>>>> f838a40ff28785f7358a6f3abf37b3cf89ad0d25
 }

 h1,